[Zope3-checkins] CVS: Zope3/src/zodb/zeo/tests - test_zeo.py:1.1.2.2

[Barry Warsaw]

Update of /cvs-repository/Zope3/src/zodb/zeo/tests
In directory cvs.zope.org:/tmp/cvs-serv20564

Modified Files:
      Tag: NameGeddon-branch
	test_zeo.py 
Log Message:
more fixes


=== Zope3/src/zodb/zeo/tests/test_zeo.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/zeo/tests/test_zeo.py:1.1.2.1	Mon Dec 23 14:30:53 2002
+++ Zope3/src/zodb/zeo/tests/test_zeo.py	Mon Dec 23 17:29:21 2002
@@ -30,20 +30,20 @@
 
 
 # ZODB test mixin classes
-from zodb.storage.tests import StorageTestBase, BasicStorage, VersionStorage, \
-     TransactionalUndoStorage, TransactionalUndoVersionStorage, \
-     PackableStorage, Synchronization, ConflictResolution, RevisionStorage, \
-     MTStorage, ReadOnlyStorage
+from zodb.storage.tests import base, basic, version, \
+     undo, undoversion, \
+     packable, synchronization, conflict, revision, \
+     mt, readonly
 
 # ZEO imports
 from zodb.zeo.client import ClientStorage
 from zodb.zeo.exceptions import Disconnected
 
 # ZEO test support
-from zodb.zeo.tests import forker, Cache
+from zodb.zeo.tests import forker, cache
 
 # ZEO test mixin classes
-from zodb.zeo.tests import CommitLockTests, ThreadTests
+from zodb.zeo.tests import commitlock, threadtests
 
 class DummyDB:
     def invalidate(self, *args):
@@ -82,24 +82,24 @@
 
 class GenericTests(
     # Base class for all ZODB tests
-    StorageTestBase.StorageTestBase,
+    base.StorageTestBase,
     # ZODB test mixin classes (in the same order as imported)
-    BasicStorage.BasicStorage,
-    VersionStorage.VersionStorage,
-    TransactionalUndoStorage.TransactionalUndoStorage,
-    TransactionalUndoVersionStorage.TransactionalUndoVersionStorage,
-    PackableStorage.PackableStorage,
-    Synchronization.SynchronizedStorage,
-    ConflictResolution.ConflictResolvingStorage,
-    ConflictResolution.ConflictResolvingTransUndoStorage,
-    RevisionStorage.RevisionStorage,
-    MTStorage.MTStorage,
-    ReadOnlyStorage.ReadOnlyStorage,
+    basic.BasicStorage,
+    version.VersionStorage,
+    undo.TransactionalUndoStorage,
+    undoversion.TransactionalUndoVersionStorage,
+    packable.PackableStorage,
+    synchronization.SynchronizedStorage,
+    conflict.ConflictResolvingStorage,
+    conflict.ConflictResolvingTransUndoStorage,
+    revision.RevisionStorage,
+    mt.MTStorage,
+    readonly.ReadOnlyStorage,
     # ZEO test mixin classes (in the same order as imported)
-    Cache.StorageWithCache,
-    Cache.TransUndoStorageWithCache,
-    CommitLockTests.CommitLockTests,
-    ThreadTests.ThreadTests,
+    cache.StorageWithCache,
+    cache.TransUndoStorageWithCache,
+    commitlock.CommitLockTests,
+    threadtests.ThreadTests,
     # Locally defined (see above)
     MiscZEOTests
     ):