[Zodb-checkins] CVS: Packages/ZEO - testZEO.py:1.1.2.9

[jeremy@digicool.com]

Update of /cvs-repository/Packages/ZEO/tests
In directory korak:/tmp/cvs-serv19570

Modified Files:
      Tag: ZEO-ZRPC-Dev
	testZEO.py 
Log Message:
Update to use new zodb_pickle() func.
Add ConflictResolution test cases for testZEO w/FileStorage.



--- Updated File testZEO.py in package Packages/ZEO --
--- testZEO.py	2001/05/01 18:58:20	1.1.2.8
+++ testZEO.py	2001/05/02 20:55:20	1.1.2.9
@@ -16,10 +16,11 @@
 # Sorry Jim...
 from ZODB.tests import StorageTestBase, BasicStorage, VersionStorage, \
      TransactionalUndoStorage, TransactionalUndoVersionStorage, \
-     PackableStorage, Synchronization
+     PackableStorage, Synchronization, ConflictResolution
+from ZODB.tests.MinPO import MinPO
 
+
 ZERO = '\0'*8
-import pickle
 
 class ZEOTestBase(StorageTestBase.StorageTestBase):
     """Version of the storage test class that supports ZEO.
@@ -46,9 +47,9 @@
         if revid is None:
             revid = ZERO
         if data is None:
-            data = 7
+            data = MinPO(7)
         if not already_pickled:
-            data = pickle.dumps(data)
+            data = StorageTestBase.zodb_pickle(data)
         if version is None:
             version = ''
         # Begin the transaction
@@ -82,6 +83,7 @@
                    VersionStorage.VersionStorage,
                    PackableStorage.PackableStorage,
                    Synchronization.SynchronizedStorage,
+                   ConflictResolution.ConflictResolvingStorage,
                    TransactionalUndoStorage.TransactionalUndoStorage,
       TransactionalUndoVersionStorage.TransactionalUndoVersionStorage,
                    ):