--- a/tests/run-tests.py Mon Apr 21 09:30:11 2014 -0700
+++ b/tests/run-tests.py Sun Apr 20 15:46:34 2014 -0700
@@ -456,8 +456,6 @@
except Exception, e:
return self.fail('Exception during execution: %s' % e, 255)
- killdaemons(env['DAEMON_PIDS'])
-
def describe(ret):
if ret < 0:
return 'killed by signal: %d' % -ret
@@ -522,6 +520,10 @@
def tearDown(self):
"""Tasks to perform after run()."""
+ for entry in self._daemonpids:
+ killdaemons(entry)
+ self._daemonpids = []
+
if not self._options.keep_tmpdir:
shutil.rmtree(self._testtmp)