summaryrefslogtreecommitdiff
path: root/scripts/LocalDriver.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-06-19 12:04:51 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-06-19 12:04:51 +0200
commit2e0c2d12991ac01d4a8ccebfeeec3531a33e477f (patch)
tree7250c48e7f7d2bd884a1f143ecf2dbc9a4e1b863 /scripts/LocalDriver.py
parentTest IceStorm With Debug configurations on Windows (diff)
downloadice-2e0c2d12991ac01d4a8ccebfeeec3531a33e477f.tar.bz2
ice-2e0c2d12991ac01d4a8ccebfeeec3531a33e477f.tar.xz
ice-2e0c2d12991ac01d4a8ccebfeeec3531a33e477f.zip
Fixed ICE-8101 - test failure causes tests running concurrently to be killed
Diffstat (limited to 'scripts/LocalDriver.py')
-rw-r--r--scripts/LocalDriver.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/LocalDriver.py b/scripts/LocalDriver.py
index e4c6a4a0a79..0835c8aa192 100644
--- a/scripts/LocalDriver.py
+++ b/scripts/LocalDriver.py
@@ -400,6 +400,8 @@ class LocalDriver(Driver):
results = executor.runUntilCompleted(self, self.start)
+ Expect.cleanup() # Cleanup processes which might still be around
+
failures = [r for r in results if not r.isSuccess()]
m, s = divmod(time.time() - now, 60)
print("")