[Zope3-checkins] CVS: ZODB4/src/zodb/storage/tests - basic.py:1.6.4.1 readonly.py:1.4.4.2 synchronization.py:1.4.4.1

[Barry Warsaw]

Update of /cvs-repository/ZODB4/src/zodb/storage/tests
In directory cvs.zope.org:/tmp/cvs-serv11957/storage/tests

Modified Files:
      Tag: opaque-pickles-branch
	basic.py readonly.py synchronization.py 
Log Message:
Baby steps: all store() methods now unpack the (data, refs) tuple in
their argument lists.  This also fixes all the tests to conform.

Next step: get rid of the tuple in the argument list.


=== ZODB4/src/zodb/storage/tests/basic.py 1.6 => 1.6.4.1 ===
--- ZODB4/src/zodb/storage/tests/basic.py:1.6	Wed Feb  5 18:28:27 2003
+++ ZODB4/src/zodb/storage/tests/basic.py	Thu Mar 13 11:31:51 2003
@@ -59,7 +59,7 @@
         # different Transaction object than the one we've begun on.
         self._storage.tpcBegin(t)
         self.assertRaises(StorageTransactionError, self._storage.store,
-                          0, 0, 0, 0, Transaction())
+                          0, 0, (0, 0), 0, Transaction())
 
         try:
             self._storage.abortVersion('dummy', Transaction())
@@ -76,7 +76,7 @@
             assert 0, "Should have failed, invalid transaction."
 
         self.assertRaises(StorageTransactionError, self._storage.store,
-                          0, 1, 2, 3, Transaction())
+                          0, 1, (2, 3), 4, Transaction())
         self._storage.tpcAbort(t)
 
     def checkSerialIsNoneForInitialRevision(self):


=== ZODB4/src/zodb/storage/tests/readonly.py 1.4.4.1 => 1.4.4.2 ===
--- ZODB4/src/zodb/storage/tests/readonly.py:1.4.4.1	Wed Mar 12 18:22:27 2003
+++ ZODB4/src/zodb/storage/tests/readonly.py	Thu Mar 13 11:31:51 2003
@@ -52,7 +52,7 @@
         self.assertRaises(ReadOnlyError, self._storage.commitVersion,
                           '', '', t)
         self.assertRaises(ReadOnlyError, self._storage.store,
-                          ZERO, None, '', '', t)
+                          ZERO, None, ('', ''), '', t)
 
         if IUndoStorage.isImplementedBy(self._storage):
             self.assertRaises(ReadOnlyError, self._storage.undo,


=== ZODB4/src/zodb/storage/tests/synchronization.py 1.4 => 1.4.4.1 ===
--- ZODB4/src/zodb/storage/tests/synchronization.py:1.4	Wed Feb  5 18:28:27 2003
+++ ZODB4/src/zodb/storage/tests/synchronization.py	Thu Mar 13 11:31:51 2003
@@ -103,11 +103,11 @@
 
     def checkStoreNotCommitting(self):
         self.verifyNotCommitting(self._storage.store,
-                                 OID, SERIALNO, "", "", Transaction())
+                                 OID, SERIALNO, ("", ""), "", Transaction())
 
     def checkStoreWrongTrans(self):
         self.verifyWrongTrans(self._storage.store,
-                              OID, SERIALNO, "", "", Transaction())
+                              OID, SERIALNO, ("", ""), "", Transaction())
 
 ##    def checkNewOidNotCommitting(self):
 ##        self.verifyNotCommitting(self._storage.new_oid)