[Zope-Checkins] CVS: ZODB3/ZODB/tests - testRecover.py:1.4.2.2 testZODB.py:1.16.2.1

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZODB/tests
In directory cvs.zope.org:/tmp/cvs-serv12189/ZODB/tests

Modified Files:
      Tag: ZODB3-mvcc-2-branch
	testRecover.py testZODB.py 
Log Message:
Remove more uses of removefs().


=== ZODB3/ZODB/tests/testRecover.py 1.4.2.1 => 1.4.2.2 ===
--- ZODB3/ZODB/tests/testRecover.py:1.4.2.1	Thu Oct  9 16:26:24 2003
+++ ZODB3/ZODB/tests/testRecover.py	Wed Nov 12 00:44:47 2003
@@ -25,7 +25,6 @@
 from ZODB.FileStorage import FileStorage
 from ZODB.PersistentMapping import PersistentMapping
 from ZODB.fsrecover import recover
-from ZODB.tests.StorageTestBase import removefs
 
 from ZODB.FileStorage.fsdump import Dumper
 
@@ -46,8 +45,10 @@
         self.storage.close()
         if self.recovered is not None:
             self.recovered.close()
-        removefs(self.path)
-        removefs(self.dest)
+        self.storage.cleanup()
+        temp = FileStorage(self.dest)
+        temp.close()
+        temp.cleanup()
 
     def populate(self):
         db = ZODB.DB(self.storage)


=== ZODB3/ZODB/tests/testZODB.py 1.16 => 1.16.2.1 ===
--- ZODB3/ZODB/tests/testZODB.py:1.16	Thu Oct  2 14:17:17 2003
+++ ZODB3/ZODB/tests/testZODB.py	Wed Nov 12 00:44:47 2003
@@ -19,7 +19,6 @@
 import ZODB.FileStorage
 from ZODB.PersistentMapping import PersistentMapping
 from ZODB.POSException import ReadConflictError, ConflictError
-from ZODB.tests.StorageTestBase import removefs
 from Persistence import Persistent
 
 class P(Persistent):
@@ -55,7 +54,7 @@
 
     def tearDown(self):
         self._db.close()
-        removefs("ZODBTests.fs")
+        self._storage.cleanup()
 
     def checkExportImport(self, abort_it=0, dup_name='test_duplicate'):
         self.populate()