[Zope-Checkins] CVS: StandaloneZODB/ZODB/tests - BasicStorage.py:1.16.4.1

Guido van Rossum guido@python.org
Wed, 23 Jan 2002 20:49:47 -0500


Update of /cvs-repository/StandaloneZODB/ZODB/tests
In directory cvs.zope.org:/tmp/cvs-serv8847

Modified Files:
      Tag: Recovery
	BasicStorage.py 
Log Message:
Merge Jeremy's 1.17 into Recovery branch:

Remove uses of self._transaction.


=== StandaloneZODB/ZODB/tests/BasicStorage.py 1.16 => 1.16.4.1 ===
         eq = self.assertEqual
         oid = self._storage.new_oid()
-        txn = self._transaction
+        txn = Transaction()
         self._storage.tpc_begin(txn)
         # Use None for serial.  Don't use _dostore() here because that coerces
         # serial=None to serial=ZERO.
@@ -120,11 +120,11 @@
 
     def checkWriteAfterAbort(self):
         oid = self._storage.new_oid()
-        self._storage.tpc_begin(self._transaction)
-        self._storage.store(oid, ZERO, zodb_pickle(MinPO(5)),
-                            '', self._transaction)
+        t = Transaction()
+        self._storage.tpc_begin(t)
+        self._storage.store(oid, ZERO, zodb_pickle(MinPO(5)), '', t)
         # Now abort this transaction
-        self._storage.tpc_abort(self._transaction)
+        self._storage.tpc_abort(t)
         # Now start all over again
         oid = self._storage.new_oid()
         self._dostore(oid=oid, data=MinPO(6))