[Zope-Checkins] CVS: Zope/lib/python/Products/ZCTextIndex/tests - testIndex.py:1.13 testLexicon.py:1.7

[Casey Duncan]

Update of /cvs-repository/Zope/lib/python/Products/ZCTextIndex/tests
In directory cvs.zope.org:/tmp/cvs-serv24523/lib/python/Products/ZCTextIndex/tests

Modified Files:
	testIndex.py testLexicon.py 
Log Message:
Collector #960: Conflict tests now properly cleanup after themselves


=== Zope/lib/python/Products/ZCTextIndex/tests/testIndex.py 1.12 => 1.13 ===
--- Zope/lib/python/Products/ZCTextIndex/tests/testIndex.py:1.12	Thu Jun  5 15:43:55 2003
+++ Zope/lib/python/Products/ZCTextIndex/tests/testIndex.py	Tue Jul 15 10:03:07 2003
@@ -159,11 +159,12 @@
 
 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


=== Zope/lib/python/Products/ZCTextIndex/tests/testLexicon.py 1.6 => 1.7 ===
--- Zope/lib/python/Products/ZCTextIndex/tests/testLexicon.py:1.6	Thu Jun  5 15:43:55 2003
+++ Zope/lib/python/Products/ZCTextIndex/tests/testLexicon.py	Tue Jul 15 10:03:07 2003
@@ -146,11 +146,12 @@
         
 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