[Neo-report] r2779 jm - /trunk/neo/tests/storage/

[nobody at svn.erp5.org]

Author: jm
Date: Tue Jun 14 13:28:59 2011
New Revision: 2779

Log:
Update replication test wrt r2777

Modified:
    trunk/neo/tests/storage/testReplicationHandler.py
    trunk/neo/tests/storage/testStorageDBTests.py

Modified: trunk/neo/tests/storage/testReplicationHandler.py
==============================================================================
--- trunk/neo/tests/storage/testReplicationHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testReplicationHandler.py [iso-8859-1] Tue Jun 14 13:28:59 2011
@@ -531,7 +531,8 @@ class StorageReplicationHandlerTests(Neo
         # ...and delete partition tail
         calls = app.dm.mockGetNamedCalls('deleteObjectsAbove')
         self.assertEqual(len(calls), 1)
-        calls[0].checkArgs(num_partitions, rid, max_oid, add64(max_serial, 1))
+        calls[0].checkArgs(num_partitions, rid, max_oid, add64(max_serial, 1),
+            ZERO_TID)
 
     def test_answerCheckSerialRangeDifferentBigChunk(self):
         min_oid = self.getOID(1)
@@ -625,7 +626,8 @@ class StorageReplicationHandlerTests(Neo
         # ...and delete partition tail
         calls = app.dm.mockGetNamedCalls('deleteObjectsAbove')
         self.assertEqual(len(calls), 1)
-        calls[0].checkArgs(num_partitions, rid, max_oid, add64(max_serial, 1))
+        calls[0].checkArgs(num_partitions, rid, max_oid, add64(max_serial, 1),
+            critical_tid)
 
 if __name__ == "__main__":
     unittest.main()

Modified: trunk/neo/tests/storage/testStorageDBTests.py
==============================================================================
--- trunk/neo/tests/storage/testStorageDBTests.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testStorageDBTests.py [iso-8859-1] Tue Jun 14 13:28:59 2011
@@ -383,7 +383,7 @@ class StorageDBTests(NeoUnitTestBase):
             txn, objs = self.getTransaction([oid1, oid2, oid3])
             self.db.storeTransaction(tid, objs, txn)
             self.db.finishTransaction(tid)
-        self.db.deleteObjectsAbove(2, 0, oid1, tid2)
+        self.db.deleteObjectsAbove(2, 0, oid1, tid2, tid3)
         # Check getObjectHistoryFrom because MySQL adapter use two tables
         # that must be synchronized
         self.assertEqual(self.db.getObjectHistoryFrom(ZERO_OID, ZERO_TID,