[Zope-Checkins] CVS: ZODB3/BDBStorage/tests - test_storage_api.py:1.23.2.5

[Barry Warsaw]

Update of /cvs-repository/ZODB3/BDBStorage/tests
In directory cvs.zope.org:/tmp/cvs-serv7047/BDBStorage/tests

Modified Files:
      Tag: ZODB3-3_1-branch
	test_storage_api.py 
Log Message:
Back port a few changes from ZODB 3 head:

re-enable the RecoveryStorage mixin, which I'm about to commit the
refactoring of.


=== ZODB3/BDBStorage/tests/test_storage_api.py 1.23.2.4 => 1.23.2.5 ===
--- ZODB3/BDBStorage/tests/test_storage_api.py:1.23.2.4	Fri Jan 31 15:56:24 2003
+++ ZODB3/BDBStorage/tests/test_storage_api.py	Thu Jul 24 14:47:28 2003
@@ -29,7 +29,7 @@
 from ZODB.tests.PackableStorage import PackableStorage
 from ZODB.tests.HistoryStorage import HistoryStorage
 from ZODB.tests.IteratorStorage import IteratorStorage, ExtendedIteratorStorage
-#from ZODB.tests.RecoveryStorage import RecoveryStorage
+from ZODB.tests.RecoveryStorage import RecoveryStorage
 from ZODB.tests import ConflictResolution
 
 
@@ -58,20 +58,21 @@
 
 DST_DBHOME = 'test-dst'
 
-##class FullRecoveryTest(BerkeleyTestBase.FullTestBase,
-##                       RecoveryStorage):
-##    def setUp(self):
-##        BerkeleyTestBase.FullTestBase.setUp(self)
-##        self._zap_dbhome(DST_DBHOME)
-##        self._dst = self._mk_dbhome(DST_DBHOME)
-
-##    def tearDown(self):
-##        BerkeleyTestBase.FullTestBase.tearDown(self)
-##        self._zap_dbhome(DST_DBHOME)
-
-##    def new_dest(self):
-##        self._zap_dbhome(DST_DBHOME)
-##        return self._mk_dbhome(DST_DBHOME)
+class FullRecoveryTest(BerkeleyTestBase.FullTestBase,
+                       RecoveryStorage):
+    def setUp(self):
+        BerkeleyTestBase.FullTestBase.setUp(self)
+        self._zap_dbhome(DST_DBHOME)
+        self._dst = self._mk_dbhome(DST_DBHOME)
+
+    def tearDown(self):
+        BerkeleyTestBase.FullTestBase.tearDown(self)
+        self._dst.close()
+        self._zap_dbhome(DST_DBHOME)
+
+    def new_dest(self):
+        self._zap_dbhome(DST_DBHOME)
+        return self._mk_dbhome(DST_DBHOME)
 
 
 
@@ -79,7 +80,7 @@
     suite = unittest.TestSuite()
     if BDBStorage.is_available:
         suite.addTest(unittest.makeSuite(FullTest, 'check'))
-##        suite.addTest(unittest.makeSuite(FullRecoveryTest, 'check'))
+        suite.addTest(unittest.makeSuite(FullRecoveryTest, 'check'))
         suite.addTest(unittest.makeSuite(MinimalTest, 'check'))
     return suite