diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-06-26 13:56:14 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-06-26 13:56:14 +0200 |
| commit | 4a9cbd1488cb38e1339871e682c2f1f279247d63 (patch) | |
| tree | 0c181df171d8d7dd38b7f86639ff30dec56a44e4 /scripts/Util.py | |
| parent | Fix for ICE-8156 - potential fix for controller crash (diff) | |
| download | ice-4a9cbd1488cb38e1339871e682c2f1f279247d63.tar.bz2 ice-4a9cbd1488cb38e1339871e682c2f1f279247d63.tar.xz ice-4a9cbd1488cb38e1339871e682c2f1f279247d63.zip | |
Fixed issue when allTests.py couldn't be interrupted when running with remote controller
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 9b1a1e5a894..72963bf6948 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -1824,10 +1824,10 @@ class RemoteProcessController(ProcessController): import Ice try: result = self.proxy.waitSuccess(timeout) + except Ice.UserException: + raise Expect.TIMEOUT("waitSuccess timeout") except Ice.LocalException: raise - except: - raise Expect.TIMEOUT("waitSuccess timeout") if exitstatus != result: raise RuntimeError("unexpected exit status: expected: %d, got %d\n" % (exitstatus, result)) |