[Zodb-checkins] CVS: ZODB3/ZEO/tests - ConnectionTests.py:1.30

Jeremy Hylton jeremy at zope.com
Mon Jun 16 14:37:53 EDT 2003


Update of /cvs-repository/ZODB3/ZEO/tests
In directory cvs.zope.org:/tmp/cvs-serv20913/ZEO/tests

Modified Files:
	ConnectionTests.py 
Log Message:
If multiple config files are created, make sure they are all deleted.


=== ZODB3/ZEO/tests/ConnectionTests.py 1.29 => 1.30 ===
--- ZODB3/ZEO/tests/ConnectionTests.py:1.29	Fri Jun 13 18:28:59 2003
+++ ZODB3/ZEO/tests/ConnectionTests.py	Mon Jun 16 13:37:52 2003
@@ -85,15 +85,15 @@
         self.addr = []
         self._pids = []
         self._servers = []
-        self.conf_path = None
+        self.conf_paths = []
         self._newAddr()
         self.startServer()
 
     def tearDown(self):
         """Try to cause the tests to halt"""
         zLOG.LOG("testZEO", zLOG.INFO, "tearDown() %s" % self.id())
-        if self.conf_path:
-            os.remove(self.conf_path)
+        for p in self.conf_paths:
+            os.remove(p)
         if getattr(self, '_storage', None) is not None:
             self._storage.close()
             if hasattr(self._storage, 'cleanup'):
@@ -163,7 +163,7 @@
         zeoport, adminaddr, pid, path = forker.start_zeo_server(sconf, zconf,
                                                                 addr[1],
                                                                 self.keep)
-        self.conf_path = path
+        self.conf_paths.append(path)
         self._pids.append(pid)
         self._servers.append(adminaddr)
 




More information about the Zodb-checkins mailing list