Collector #960: Conflict tests now properly cleanup after themselves

zopefoundation · Jul 15, 2003 · e6a773d · e6a773d
1 parent ca3d95f
commit e6a773d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/tests/testIndex.py b/tests/testIndex.py
@@ -159,11 +159,12 @@ class OkapiIndexTest(IndexTest):
 
 class TestIndexConflict(TestCase):
 
-    storage = None
+    db = None
 
     def tearDown(self):
-        if self.storage is not None:
-            self.storage.close()
+        if self.db is not None:
+            self.db.close()
+            self.storage.cleanup()
 
     def openDB(self):
         from ZODB.FileStorage import FileStorage

diff --git a/tests/testLexicon.py b/tests/testLexicon.py
@@ -146,11 +146,12 @@ def testUpgradeLength(self):
 
 class TestLexiconConflict(TestCase):
 
-    storage = None
+    db = None
 
     def tearDown(self):
-        if self.storage is not None:
-            self.storage.close()
+        if self.db is not None:
+            self.db.close()
+            self.storage.cleanup()
 
     def openDB(self):
         from ZODB.FileStorage import FileStorage