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

[Barry Warsaw]

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

Modified Files:
      Tag: NameGeddon-branch
	test_file.py 
Log Message:
fix


=== Zope3/src/zodb/storage/tests/test_file.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/storage/tests/test_file.py:1.1.2.2	Mon Dec 23 16:52:53 2002
+++ Zope3/src/zodb/storage/tests/test_file.py	Mon Dec 23 17:13:30 2002
@@ -17,31 +17,31 @@
 from zodb.ztransaction import Transaction
 from zodb import interfaces
 
-from zodb.storage.tests import StorageTestBase, BasicStorage, \
-     TransactionalUndoStorage, VersionStorage, \
-     TransactionalUndoVersionStorage, PackableStorage, \
-     Synchronization, ConflictResolution, HistoryStorage, \
-     IteratorStorage, Corruption, RevisionStorage, PersistentStorage, \
-     MTStorage, ReadOnlyStorage, RecoveryStorage
+from zodb.storage.tests import base, basic, \
+     undo, version, \
+     undoversion, packable, \
+     synchronization, conflict, history, \
+     iterator, corruption, revision, persistent, \
+     mt, readonly, recovery
 from zodb.storage.tests.base import MinPO, zodb_unpickle
 
 class FileStorageTests(
-    StorageTestBase.StorageTestBase,
-    BasicStorage.BasicStorage,
-    TransactionalUndoStorage.TransactionalUndoStorage,
-    RevisionStorage.RevisionStorage,
-    VersionStorage.VersionStorage,
-    TransactionalUndoVersionStorage.TransactionalUndoVersionStorage,
-    PackableStorage.PackableStorage,
-    Synchronization.SynchronizedStorage,
-    ConflictResolution.ConflictResolvingStorage,
-    ConflictResolution.ConflictResolvingTransUndoStorage,
-    HistoryStorage.HistoryStorage,
-    IteratorStorage.IteratorStorage,
-    IteratorStorage.ExtendedIteratorStorage,
-    PersistentStorage.PersistentStorage,
-    MTStorage.MTStorage,
-    ReadOnlyStorage.ReadOnlyStorage
+    base.StorageTestBase,
+    basic.BasicStorage,
+    undo.TransactionalUndoStorage,
+    revision.RevisionStorage,
+    version.VersionStorage,
+    undoversion.TransactionalUndoVersionStorage,
+    packable.PackableStorage,
+    synchronization.SynchronizedStorage,
+    conflict.ConflictResolvingStorage,
+    conflict.ConflictResolvingTransUndoStorage,
+    history.HistoryStorage,
+    iterator.IteratorStorage,
+    iterator.ExtendedIteratorStorage,
+    persistent.PersistentStorage,
+    mt.MTStorage,
+    readonly.ReadOnlyStorage
     ):
 
     def open(self, **kwargs):
@@ -49,12 +49,12 @@
                                                      **kwargs)
 
     def setUp(self):
-        StorageTestBase.removefs("FileStorageTests.fs")
+        base.removefs("FileStorageTests.fs")
         self.open(create=1)
 
     def tearDown(self):
         self._storage.close()
-        StorageTestBase.removefs("FileStorageTests.fs")
+        base.removefs("FileStorageTests.fs")
 
     def checkLongMetadata(self):
         s = "X" * 75000
@@ -72,29 +72,29 @@
             self.fail("expect long user field to raise error")
 
 class FileStorageRecoveryTest(
-    StorageTestBase.StorageTestBase,
-    RecoveryStorage.RecoveryStorage,
+    base.StorageTestBase,
+    recovery.RecoveryStorage,
     ):
 
     def setUp(self):
-        StorageTestBase.removefs("Source.fs")
-        StorageTestBase.removefs("Dest.fs")
+        base.removefs("Source.fs")
+        base.removefs("Dest.fs")
         self._storage = ZODB.FileStorage.FileStorage('Source.fs')
         self._dst = ZODB.FileStorage.FileStorage('Dest.fs')
 
     def tearDown(self):
         self._storage.close()
         self._dst.close()
-        StorageTestBase.removefs("Source.fs")
-        StorageTestBase.removefs("Dest.fs")
+        base.removefs("Source.fs")
+        base.removefs("Dest.fs")
 
     def new_dest(self):
-        StorageTestBase.removefs('Dest.fs')
+        base.removefs('Dest.fs')
         return ZODB.FileStorage.FileStorage('Dest.fs')
 
 def test_suite():
     suite = unittest.makeSuite(FileStorageTests, 'check')
-    suite2 = unittest.makeSuite(Corruption.FileStorageCorruptTests, 'check')
+    suite2 = unittest.makeSuite(corruption.FileStorageCorruptTests, 'check')
     suite3 = unittest.makeSuite(FileStorageRecoveryTest, 'check')
     suite.addTest(suite2)
     suite.addTest(suite3)