summaryrefslogtreecommitdiff
path: root/scripts/LocalDriver.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2019-06-21 14:39:01 +0200
committerBenoit Foucher <benoit@zeroc.com>2019-06-21 14:39:01 +0200
commit44ef60a97b8667e0c0ac54ab91af89872775a772 (patch)
treeb1fc48ab9e5f3e02c5dcc481d0dba98703f10f98 /scripts/LocalDriver.py
parentIce/invoke test only run with default sync server - Close #399 (diff)
downloadice-44ef60a97b8667e0c0ac54ab91af89872775a772.tar.bz2
ice-44ef60a97b8667e0c0ac54ab91af89872775a772.tar.xz
ice-44ef60a97b8667e0c0ac54ab91af89872775a772.zip
Fixed bug in Util.py where KeyboardInterrupt wasn't catch in spawned thread, also fixed typo in test.py files
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 a04c03157a0..1dd6f858e34 100644
--- a/scripts/LocalDriver.py
+++ b/scripts/LocalDriver.py
@@ -577,6 +577,8 @@ class LocalDriver(Driver):
self.runner.stopServerSide(server, current, success)
except Exception as ex:
failure.append(ex)
+ except KeyboardInterrupt: # Potentially raised by Except.py if Ctrl-C
+ pass
sem.release()
t=threading.Thread(target = stopServerSide)