diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-10-17 10:35:44 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-10-17 10:35:44 +0200 |
| commit | 6dae65ec8c9f38aef7a90820f9ba5fb92649ebf8 (patch) | |
| tree | 4cbe70089a05d57ad8376dec49dba60aac337d41 /scripts/LocalDriver.py | |
| parent | Fix IceStorm to correctly load topics from database (diff) | |
| download | ice-6dae65ec8c9f38aef7a90820f9ba5fb92649ebf8.tar.bz2 ice-6dae65ec8c9f38aef7a90820f9ba5fb92649ebf8.tar.xz ice-6dae65ec8c9f38aef7a90820f9ba5fb92649ebf8.zip | |
Fixed bug in test driver where server failures could go un-noticed, cleaned up some debug output from JS test
Diffstat (limited to 'scripts/LocalDriver.py')
| -rw-r--r-- | scripts/LocalDriver.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/LocalDriver.py b/scripts/LocalDriver.py index e0f6f2ae306..3999c56263c 100644 --- a/scripts/LocalDriver.py +++ b/scripts/LocalDriver.py @@ -569,11 +569,20 @@ class LocalDriver(Driver): # interrupted by potential KeyboardInterrupt exceptions which could leave some servers # behind. # - t=threading.Thread(target = lambda: self.runner.stopServerSide(server, current, success)) + failure = [] + def stopServerSide(): + try: + self.runner.stopServerSide(server, current, success) + except Exception as ex: + failure.append(ex) + + t=threading.Thread(target = stopServerSide) t.start() while True: try: t.join() + if failure: + raise failure[0] break except KeyboardInterrupt: pass # Ignore keyboard interrupts |