[Neo-report] r2269 vincent - /trunk/neo/tests/storage/testClientHandler.py

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Sep  1 16:25:33 2010
New Revision: 2269

Log:
Fix and extend askStoreObject tests.

tm.storeObject is not supposed to return a callable.

Modified:
    trunk/neo/tests/storage/testClientHandler.py

Modified: trunk/neo/tests/storage/testClientHandler.py
==============================================================================
--- trunk/neo/tests/storage/testClientHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testClientHandler.py [iso-8859-1] Wed Sep  1 16:25:33 2010
@@ -219,7 +219,11 @@ class StorageClientHandlerTests(NeoTestB
                 data, tid)
         self._checkStoreObjectCalled(tid, serial, oid, comp,
                 checksum, data, None)
-        self.checkAnswerStoreObject(conn)
+        pconflicting, poid, pserial = self.checkAnswerStoreObject(conn,
+            decode=True)
+        self.assertEqual(pconflicting, 0)
+        self.assertEqual(poid, oid)
+        self.assertEqual(pserial, serial)
 
     def test_askStoreObject2(self):
         # conflict error
@@ -229,11 +233,15 @@ class StorageClientHandlerTests(NeoTestB
         locking_tid = self.getNextTID(tid)
         def fakeStoreObject(*args):
             raise ConflictError(locking_tid)
-        self.app.tm.storeObject = lambda *kw: fakeStoreObject
+        self.app.tm.storeObject = fakeStoreObject
         oid, serial, comp, checksum, data = self._getObject()
         self.operation.askStoreObject(conn, oid, serial, comp, checksum, 
                 data, tid)
-        self.checkAnswerStoreObject(conn)
+        pconflicting, poid, pserial = self.checkAnswerStoreObject(conn,
+            decode=True)
+        self.assertEqual(pconflicting, 1)
+        self.assertEqual(poid, oid)
+        self.assertEqual(pserial, locking_tid)
 
     def test_abortTransaction(self):
         conn = self._getConnection()