diff options
| author | Jose <jose@zeroc.com> | 2019-08-02 11:10:08 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-08-02 11:10:08 +0200 |
| commit | b67d94a178754391ddd1c09ecb8ab0252f159608 (patch) | |
| tree | d3fccd3d5daf866df7f3be1be7731a958888dee3 /scripts/Util.py | |
| parent | Conditionally enable Swift mapping (diff) | |
| download | ice-b67d94a178754391ddd1c09ecb8ab0252f159608.tar.bz2 ice-b67d94a178754391ddd1c09ecb8ab0252f159608.tar.xz ice-b67d94a178754391ddd1c09ecb8ab0252f159608.zip | |
Fix for handling timeout in the test Controller
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 594fb58e742..2ec519657d9 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -2131,12 +2131,13 @@ class RemoteProcessController(ProcessController): try: result = self.proxy.waitSuccess(timeout) except Ice.UserException as ex: - if "Timeout" in ex.reason: + if "timed out" in ex.reason: raise Expect.TIMEOUT("waitSuccess timeout") else: raise except Ice.LocalException: raise + if exitstatus != result: raise RuntimeError("unexpected exit status: expected: %d, got %d\n" % (exitstatus, result)) |