Collector #960: Conflict tests now properly cleanup after themselves

lib/python/Products/ZCTextIndex/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

lib/python/Products/ZCTextIndex/tests/testLexicon.py

@@ -146,11 +146,12 @@ class Test(TestCase):
         
 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