summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-02-09 20:38:55 -0200
committerdrebs <drebs@leap.se>2013-02-09 20:38:55 -0200
commitd139faf6bb7adcc4ea1e8dcafad38fbeccc552d8 (patch)
tree1fedf2ed224b9aa70f1a12b5350975ecfeae79db /tests
parent103e0f83efac1576c41907a37467f2afe5ca5253 (diff)
Couch server subprocess for tests now waits for returncode to avoid zombie childs.
Diffstat (limited to 'tests')
-rw-r--r--tests/test_couch.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/test_couch.py b/tests/test_couch.py
index 55bcf442..09c7269e 100644
--- a/tests/test_couch.py
+++ b/tests/test_couch.py
@@ -57,7 +57,8 @@ class CouchDBWrapper(object):
args = ['couchdb', '-n' '-a', confPath]
#null = open('/dev/null', 'w')
self.process = subprocess.Popen(
- args, env=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ args, env=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+ close_fds=True)
# find port
logPath = os.path.join(self.tempdir, 'log', 'couch.log')
while not os.path.exists(logPath):
@@ -87,7 +88,7 @@ stderr:
def stop(self):
self.process.terminate()
-
+ self.process.wait()
os.system("rm -rf %s" % self.tempdir)