Commit fbf46870 authored by Jim Fulton's avatar Jim Fulton

Removed the pid cleanup code. The subprocess module does this for us.

parent 9103ec20
...@@ -104,7 +104,6 @@ class CommonSetupTearDown(StorageTestBase): ...@@ -104,7 +104,6 @@ class CommonSetupTearDown(StorageTestBase):
logging.info("setUp() %s", self.id()) logging.info("setUp() %s", self.id())
self.file = 'storage_conf' self.file = 'storage_conf'
self.addr = [] self.addr = []
self._pids = []
self._servers = [] self._servers = []
self.conf_paths = [] self.conf_paths = []
self.caches = [] self.caches = []
...@@ -133,10 +132,6 @@ class CommonSetupTearDown(StorageTestBase): ...@@ -133,10 +132,6 @@ class CommonSetupTearDown(StorageTestBase):
for adminaddr in self._servers: for adminaddr in self._servers:
if adminaddr is not None: if adminaddr is not None:
forker.shutdown_zeo_server(adminaddr) forker.shutdown_zeo_server(adminaddr)
if hasattr(os, 'waitpid'):
# Not in Windows Python until 2.3
for pid in self._pids:
os.waitpid(pid, 0)
for c in self.caches: for c in self.caches:
for i in 0, 1: for i in 0, 1:
for ext in "", ".trace", ".lock": for ext in "", ".trace", ".lock":
...@@ -219,7 +214,6 @@ class CommonSetupTearDown(StorageTestBase): ...@@ -219,7 +214,6 @@ class CommonSetupTearDown(StorageTestBase):
zeoport, adminaddr, pid, path = forker.start_zeo_server( zeoport, adminaddr, pid, path = forker.start_zeo_server(
sconf, zconf, addr[1], keep) sconf, zconf, addr[1], keep)
self.conf_paths.append(path) self.conf_paths.append(path)
self._pids.append(pid)
self._servers.append(adminaddr) self._servers.append(adminaddr)
def shutdownServer(self, index=0): def shutdownServer(self, index=0):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment