[Zodb-checkins] CVS: Zope3/src/zodb/storage/tests - base.py:1.5 basic.py:1.5 test_create.py:1.5 test_file.py:1.4 test_whitebox.py:1.5

[Jeremy Hylton]

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

Modified Files:
	base.py basic.py test_create.py test_file.py test_whitebox.py 
Log Message:
Make sure all tests use open() instead of _open().


=== Zope3/src/zodb/storage/tests/base.py 1.4 => 1.5 ===
--- Zope3/src/zodb/storage/tests/base.py:1.4	Fri Jan 24 13:55:31 2003
+++ Zope3/src/zodb/storage/tests/base.py	Mon Jan 27 11:08:23 2003
@@ -207,7 +207,7 @@
     def _envdir(self):
         return DBHOME
 
-    def _open(self):
+    def open(self):
         self._storage = self.ConcreteStorage(self._envdir(), self._config())
 
     def _zap_dbhome(self, dir=None):
@@ -233,7 +233,7 @@
     def setUp(self):
         StorageTestBase.setUp(self)
         self._zap_dbhome()
-        self._open()
+        self.open()
 
     def tearDown(self):
         StorageTestBase.tearDown(self)


=== Zope3/src/zodb/storage/tests/basic.py 1.4 => 1.5 ===
--- Zope3/src/zodb/storage/tests/basic.py:1.4	Fri Jan 24 18:20:51 2003
+++ Zope3/src/zodb/storage/tests/basic.py	Mon Jan 27 11:08:23 2003
@@ -42,7 +42,7 @@
         version = "abcd"
         self._storage.setVersion(version)
         self._storage.close()
-        self._open()
+        self.open()
         self.assertEqual(version, self._storage.getVersion())
 
     def checkBasics(self):


=== Zope3/src/zodb/storage/tests/test_create.py 1.4 => 1.5 ===
--- Zope3/src/zodb/storage/tests/test_create.py:1.4	Fri Jan 24 13:56:02 2003
+++ Zope3/src/zodb/storage/tests/test_create.py	Mon Jan 27 11:08:23 2003
@@ -93,7 +93,7 @@
 
 
 class OpenRecoveryTest(bdbmixin.FullTestBase):
-    def _open(self):
+    def open(self):
         self._storage = None
 
     def testOpenWithBogusConfig(self):


=== Zope3/src/zodb/storage/tests/test_file.py 1.3 => 1.4 ===
--- Zope3/src/zodb/storage/tests/test_file.py:1.3	Fri Jan 24 18:20:51 2003
+++ Zope3/src/zodb/storage/tests/test_file.py	Mon Jan 27 11:08:23 2003
@@ -46,8 +46,6 @@
         self._storage = zodb.storage.file.FileStorage('FileStorageTests.fs',
                                                       **kwargs)
 
-    _open = open
-
     def setUp(self):
         base.removefs("FileStorageTests.fs")
         self.open(create=1)


=== Zope3/src/zodb/storage/tests/test_whitebox.py 1.4 => 1.5 ===
--- Zope3/src/zodb/storage/tests/test_whitebox.py:1.4	Fri Jan 24 13:58:42 2003
+++ Zope3/src/zodb/storage/tests/test_whitebox.py	Mon Jan 27 11:08:23 2003
@@ -81,7 +81,7 @@
         eq = self.assertEqual
         eq(self._storage._info['version'], BDBMINIMAL_SCHEMA_VERSION)
         self._storage.close()
-        self._open()
+        self.open()
         eq(self._storage._info['version'], BDBMINIMAL_SCHEMA_VERSION)
 
 
@@ -181,7 +181,7 @@
         eq = self.assertEqual
         eq(self._storage._info['version'], BDBMINIMAL_SCHEMA_VERSION)
         self._storage.close()
-        self._open()
+        self.open()
         eq(self._storage._info['version'], BDBMINIMAL_SCHEMA_VERSION)