diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-04-18 21:36:47 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-04-18 21:36:47 +0200 |
| commit | fc223c404978ca7e129c381133bd0fec55dcb649 (patch) | |
| tree | 758528b544be0f06381321712b99493da68c77e2 /scripts/Util.py | |
| parent | Disable VC++ new optimizer in UWP Ice/metrics collocated tests (diff) | |
| download | ice-fc223c404978ca7e129c381133bd0fec55dcb649.tar.bz2 ice-fc223c404978ca7e129c381133bd0fec55dcb649.tar.xz ice-fc223c404978ca7e129c381133bd0fec55dcb649.zip | |
Fixed controller exception handling and bumped the timeout
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 19c50e2c78e..bbcdb4b78db 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -990,7 +990,7 @@ class Process(Runnable): print("unexpected exception while filtering process output:\n" + str(ex)) raise - def run(self, current, args=[], props={}, exitstatus=0, timeout=240): + def run(self, current, args=[], props={}, exitstatus=0, timeout=480): class WatchDog: def __init__(self, timeout): @@ -1747,8 +1747,11 @@ class RemoteProcessController(ProcessController): self.proxy.waitReady(startTimeout) def waitSuccess(self, exitstatus=0, timeout=60): + import Ice try: result = self.proxy.waitSuccess(timeout) + except Ice.LocaException: + raise except: raise Expect.TIMEOUT("waitSuccess timeout") if exitstatus != result: |