summaryrefslogtreecommitdiff
path: root/scripts/Expect.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-01-28 10:35:55 +0100
committerJose <jose@zeroc.com>2015-01-28 10:35:55 +0100
commit093b3ec0741c50462ffd2cd5afd9d07dbf6e42be (patch)
treec22963fd0fb80c832d7f6ef70a323d57765f65d5 /scripts/Expect.py
parentAdded test for ICE-5833, generated #include in headers files (diff)
downloadice-093b3ec0741c50462ffd2cd5afd9d07dbf6e42be.tar.bz2
ice-093b3ec0741c50462ffd2cd5afd9d07dbf6e42be.tar.xz
ice-093b3ec0741c50462ffd2cd5afd9d07dbf6e42be.zip
Fixed (ICE-6190) - Improve WinRT ssl/wss testing
Diffstat (limited to 'scripts/Expect.py')
-rwxr-xr-xscripts/Expect.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/Expect.py b/scripts/Expect.py
index 694d1cdfbeb..985e5c80e5b 100755
--- a/scripts/Expect.py
+++ b/scripts/Expect.py
@@ -329,9 +329,14 @@ def cleanup():
except:
pass
processes.clear()
-
atexit.register(cleanup)
+def signal_handler(signal, frame):
+ cleanup()
+ sys.exit(0)
+signal.signal(signal.SIGINT, signal_handler)
+signal.signal(signal.SIGTERM, signal_handler)
+
class Expect (object):
def __init__(self, command, startReader = True, timeout=30, logfile=None, mapping = None, desc = None, cwd = None, env = None):
self.buf = "" # The part before the match