[Zope3-checkins] CVS: Zope3/src/zodb/storage/tests - test_storage_api.py:1.1.2.3

[Barry Warsaw]

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

Modified Files:
      Tag: NameGeddon-branch
	test_storage_api.py 
Log Message:
Blink


=== Zope3/src/zodb/storage/tests/test_storage_api.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/storage/tests/test_storage_api.py:1.1.2.2	Mon Dec 23 16:52:53 2002
+++ Zope3/src/zodb/storage/tests/test_storage_api.py	Mon Dec 23 17:18:09 2002
@@ -21,7 +21,7 @@
 
 from zodb import interfaces
 
-import zodb.storage.tests.base
+from zodb.storage.tests import base
 from zodb.storage.tests.basic import BasicStorage
 from zodb.storage.tests.revision import RevisionStorage
 from zodb.storage.tests.version import VersionStorage
@@ -30,13 +30,14 @@
      TransactionalUndoVersionStorage
 from zodb.storage.tests.packable import PackableStorage
 from zodb.storage.tests.history import HistoryStorage
-from zodb.storage.tests.iterator import IteratorStorage, ExtendedIteratorStorage
+from zodb.storage.tests.iterator import \
+     IteratorStorage, ExtendedIteratorStorage
 from zodb.storage.tests.recovery import RecoveryStorage
-from zodb.storage.tests import ConflictResolution
+from zodb.storage.tests import conflict
 
 
 
-class MinimalTest(BerkeleyTestBase.MinimalTestBase, BasicStorage):
+class MinimalTest(base.MinimalTestBase, BasicStorage):
     def checkVersionedStoreAndLoad(self):
         # This storage doesn't support versions, so we should get an exception
         oid = self._storage.new_oid()
@@ -45,30 +46,30 @@
                           oid, data=11, version='a version')
 
 
-class FullTest(BerkeleyTestBase.FullTestBase, BasicStorage,
+class FullTest(base.FullTestBase, BasicStorage,
                RevisionStorage, VersionStorage,
                TransactionalUndoStorage,
                TransactionalUndoVersionStorage,
                PackableStorage,
                HistoryStorage,
                IteratorStorage, ExtendedIteratorStorage,
-               ConflictResolution.ConflictResolvingStorage,
-               ConflictResolution.ConflictResolvingTransUndoStorage):
+               conflict.ConflictResolvingStorage,
+               conflict.ConflictResolvingTransUndoStorage):
     pass
 
 
 
 DST_DBHOME = 'test-dst'
 
-class FullRecoveryTest(BerkeleyTestBase.FullTestBase,
+class FullRecoveryTest(base.FullTestBase,
                        RecoveryStorage):
     def setUp(self):
-        BerkeleyTestBase.FullTestBase.setUp(self)
+        base.FullTestBase.setUp(self)
         self._zap_dbhome(DST_DBHOME)
         self._dst = self._mk_dbhome(DST_DBHOME)
 
     def tearDown(self):
-        BerkeleyTestBase.FullTestBase.tearDown(self)
+        base.FullTestBase.tearDown(self)
         self._zap_dbhome(DST_DBHOME)
 
     def new_dest(self):