[Zope3-checkins] CVS: Zope3/src/zodb/storage/tests - test_create.py:1.1.2.2

[Barry Warsaw]

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

Modified Files:
      Tag: NameGeddon-branch
	test_create.py 
Log Message:
more fnixes


=== Zope3/src/zodb/storage/tests/test_create.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/storage/tests/test_create.py:1.1.2.1	Mon Dec 23 14:30:50 2002
+++ Zope3/src/zodb/storage/tests/test_create.py	Mon Dec 23 17:35:37 2002
@@ -19,33 +19,33 @@
 import unittest
 
 from zodb.storage.base import BerkeleyConfig
-from BDBStorage.tests import BerkeleyTestBase
+from zodb.storage.tests import base
 from zodb.storage.bdbfull import BDBFullStorage
 
 
 
 class TestMixin:
     def checkDBHomeExists(self):
-        self.failUnless(os.path.isdir(BerkeleyTestBase.DBHOME))
+        self.failUnless(os.path.isdir(base.DBHOME))
 
 
-class MinimalCreateTest(BerkeleyTestBase.MinimalTestBase, TestMixin):
+class MinimalCreateTest(base.MinimalTestBase, TestMixin):
     pass
 
 
-class FullCreateTest(BerkeleyTestBase.FullTestBase, TestMixin):
+class FullCreateTest(base.FullTestBase, TestMixin):
     pass
 
 
 
-class FullOpenExistingTest(BerkeleyTestBase.FullTestBase):
+class FullOpenExistingTest(base.FullTestBase):
     def checkOpenWithExistingVersions(self):
         version = 'test-version'
         oid = self._storage.new_oid()
         revid = self._dostore(oid, data=7, version=version)
         # Now close the current storage and re-open it
         self._storage.close()
-        self._storage = self.ConcreteStorage(BerkeleyTestBase.DBHOME)
+        self._storage = self.ConcreteStorage(base.DBHOME)
         self.assertEqual(self._storage.modifiedInVersion(oid), version)
 
     def checkOpenAddVersion(self):
@@ -55,7 +55,7 @@
         revid = self._dostore(oid1, data=7, version=version1)
         # Now close the current storage and re-open it
         self._storage.close()
-        self._storage = self.ConcreteStorage(BerkeleyTestBase.DBHOME)
+        self._storage = self.ConcreteStorage(base.DBHOME)
         eq(self._storage.modifiedInVersion(oid1), version1)
         # Now create a 2nd version string, then close/reopen
         version2 = 'new-version'
@@ -63,14 +63,14 @@
         revid = self._dostore(oid2, data=8, version=version2)
         # Now close the current storage and re-open it
         self._storage.close()
-        self._storage = self.ConcreteStorage(BerkeleyTestBase.DBHOME)
+        self._storage = self.ConcreteStorage(base.DBHOME)
         eq(self._storage.modifiedInVersion(oid1), version1)
         # Now create a 2nd version string, then close/reopen
         eq(self._storage.modifiedInVersion(oid2), version2)
 
 
 
-class FullOpenCloseTest(BerkeleyTestBase.FullTestBase):
+class FullOpenCloseTest(base.FullTestBase):
     def _mk_dbhome(self, dir):
         config = BerkeleyConfig
         config.interval = 10
@@ -87,7 +87,7 @@
 
 
 
-class OpenRecoveryTest(BerkeleyTestBase.FullTestBase):
+class OpenRecoveryTest(base.FullTestBase):
     def _mk_dbhome(self, dir):
         self._dir = dir