client: comment about 2 recently failing tests

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2820 71dcc9de-d417-0410-9af5-da40c76e7ee4

TODO

@@ -198,6 +198,8 @@ RC  - Review output of pylint (CODE)
       imports.
     - tpc_finish failures (FUNCTIONALITY)
       New failure cases during tpc_finish must be handled.
+    - Fix and reenable deadlock avoidance (SPEED). This is required for
+      neo.tests.zodb.testBasic.BasicTests.check_checkCurrentSerialInTransaction
 
     Admin
     - Make admin node able to monitor multiple clusters simultaneously

neo/client/Storage.py

@@ -128,6 +128,9 @@ class Storage(BaseStorage.BaseStorage,
     def tpc_finish(self, transaction, f=None):
         tid = self.app.tpc_finish(transaction=transaction,
             tryToResolveConflict=self.tryToResolveConflict, f=f)
+        # XXX: Note that when undoing changes, the following is useless because
+        #      a temporary Storage object is used to commit.
+        #      See also testZODB.NEOZODBTests.checkMultipleUndoInOneTransaction
         if self._snapshot_tid:
             self._snapshot_tid = add64(tid, 1)
         return tid

neo/tests/zodb/testZODB.py

@@ -31,6 +31,19 @@ class NEOZODBTests(ZODBTestCase, testZODB.ZODBTests):
         self._db.close()
         super(NEOZODBTests, self).tearDown()
 
+    def checkMultipleUndoInOneTransaction(self):
+        # XXX: Upstream test accesses a persistent object outside a transaction
+        #      (it should call transaction.begin() after the last commit)
+        #      so disable our Connection.afterCompletion optimization.
+        #      This should really be discussed on zodb-dev ML.
+        from ZODB.Connection import Connection
+        afterCompletion = Connection.__dict__['afterCompletion']
+        try:
+            Connection.afterCompletion = Connection.__dict__['newTransaction']
+            super(NEOZODBTests, self).checkMultipleUndoInOneTransaction()
+        finally:
+            Connection.afterCompletion = afterCompletion
+
 if __name__ == "__main__":
     suite = unittest.makeSuite(NEOZODBTests, 'check')
     unittest.main(defaultTest='suite')