[Zodb-checkins] CVS: ZODB3/ZEO/tests - testZEO.py:1.75.2.3

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZEO/tests
In directory cvs.zope.org:/tmp/cvs-serv3278/ZEO/tests

Modified Files:
      Tag: ZODB3-mvcc-2-branch
	testZEO.py 
Log Message:
MappingStorage can't pass conflict resolution tests.


=== ZODB3/ZEO/tests/testZEO.py 1.75.2.2 => 1.75.2.3 ===
--- ZODB3/ZEO/tests/testZEO.py:1.75.2.2	Tue Nov 18 14:08:08 2003
+++ ZODB3/ZEO/tests/testZEO.py	Wed Nov 19 10:46:50 2003
@@ -103,7 +103,6 @@
     BasicStorage.BasicStorage,
     PackableStorage.PackableStorage,
     Synchronization.SynchronizedStorage,
-    ConflictResolution.ConflictResolvingStorage,
     MTStorage.MTStorage,
     ReadOnlyStorage.ReadOnlyStorage,
     # ZEO test mixin classes (in the same order as imported)
@@ -164,6 +163,7 @@
     GenericTests,
     Cache.StorageWithCache,
     Cache.TransUndoStorageWithCache,
+    ConflictResolution.ConflictResolvingStorage,
     ConflictResolution.ConflictResolvingTransUndoStorage,
     RevisionStorage.RevisionStorage,
     TransactionalUndoStorage.TransactionalUndoStorage,