[Zope-Checkins] CVS: ZODB3/ZEO/tests - CommitLockTests.py:1.15.2.2

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZEO/tests
In directory cvs.zope.org:/tmp/cvs-serv15384

Modified Files:
      Tag: ZODB3-mvcc-2-branch
	CommitLockTests.py 
Log Message:
Fix calculation of transaction id for _begin_undo().


=== ZODB3/ZEO/tests/CommitLockTests.py 1.15.2.1 => 1.15.2.2 ===
--- ZODB3/ZEO/tests/CommitLockTests.py:1.15.2.1	Thu Nov 20 15:47:13 2003
+++ ZODB3/ZEO/tests/CommitLockTests.py	Sat Nov 22 23:54:08 2003
@@ -146,10 +146,9 @@
         L = self._storage.undoInfo()
         return L[0]['id']
 
-    def _begin_undo(self, trans_id):
+    def _begin_undo(self, trans_id, txn):
         rpc = self._storage._server.rpc
-        return rpc._deferred_call('transactionalUndo', trans_id,
-                                  id(self.trans))
+        return rpc._deferred_call('transactionalUndo', trans_id, id(txn))
 
     def _finish_undo(self, msgid):
         return self._storage._server.rpc._deferred_wait(msgid)
@@ -157,7 +156,7 @@
     def checkCommitLockUndoFinish(self):
         trans_id = self._get_trans_id()
         oid, txn = self._start_txn()
-        msgid = self._begin_undo(trans_id)
+        msgid = self._begin_undo(trans_id, txn)
 
         self._begin_threads()
 
@@ -174,7 +173,7 @@
     def checkCommitLockUndoAbort(self):
         trans_id = self._get_trans_id()
         oid, txn = self._start_txn()
-        msgid = self._begin_undo(trans_id)
+        msgid = self._begin_undo(trans_id, txn)
 
         self._begin_threads()
 
@@ -190,7 +189,7 @@
     def checkCommitLockUndoClose(self):
         trans_id = self._get_trans_id()
         oid, txn = self._start_txn()
-        msgid = self._begin_undo(trans_id)
+        msgid = self._begin_undo(trans_id, txn)
 
         self._begin_threads()