Commit 3a716599 authored by Jim Fulton's avatar Jim Fulton

Added back the os.waitpid calls since we don't use subprocess on

windows. Just made the waitpid ignore exceptions. :)
parent 7db000a3
...@@ -104,6 +104,7 @@ class CommonSetupTearDown(StorageTestBase): ...@@ -104,6 +104,7 @@ 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 = []
...@@ -132,6 +133,12 @@ class CommonSetupTearDown(StorageTestBase): ...@@ -132,6 +133,12 @@ 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)
for pid in self._pids:
try:
os.waitpid(pid, 0)
except OSError:
pass # The subprocess module may already have waited
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":
...@@ -214,6 +221,7 @@ class CommonSetupTearDown(StorageTestBase): ...@@ -214,6 +221,7 @@ 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