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

[Chris McDonough]

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

Modified Files:
      Tag: Zope-2_7-branch
	testIndex.py testLexicon.py 
Log Message:
Merge changes from HEAD since the release of Zope 2.7a1 into the Zope-2_7-branch in preparation for release of Zope 2.7b1.


=== Zope/lib/python/Products/ZCTextIndex/tests/testIndex.py 1.12 => 1.12.2.1 ===
--- 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	Mon Jul 21 12:36:21 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.6.2.1 ===
--- 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	Mon Jul 21 12:36:21 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