diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-12-21 17:41:28 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-12-21 17:41:28 +0100 |
| commit | c2691f224de3d502e87db30b2c53bbfa89e10f22 (patch) | |
| tree | 85f71e4d1009a44646e4f16c4b17d8845a334008 /scripts/Util.py | |
| parent | Replaced USE_BIN_DIST with ICE_BIN_DIST (diff) | |
| download | ice-c2691f224de3d502e87db30b2c53bbfa89e10f22.tar.bz2 ice-c2691f224de3d502e87db30b2c53bbfa89e10f22.tar.xz ice-c2691f224de3d502e87db30b2c53bbfa89e10f22.zip | |
Minor fix for JS tests
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 4afe3c54808..9f45e2f4c1c 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -1686,7 +1686,10 @@ class RemoteProcessController(ProcessController): self.proxy.waitReady(startTimeout) def waitSuccess(self, exitstatus=0, timeout=60): - result = self.proxy.waitSuccess(timeout) + try: + result = self.proxy.waitSuccess(timeout) + except: + raise Except.TIMEOUT("waitSuccess timeout") if exitstatus != result: raise RuntimeError("unexpected exit status: expected: %d, got %d\n" % (exitstatus, result)) @@ -2693,7 +2696,7 @@ class JavaScriptMapping(Mapping): "serialize" : [False], "mx" : [False], "es5" : [False, True], - "worker" : [False, True] if current.config.browser else [], + "worker" : [False, True] if current.config.browser else [False], } # Edge and Ie only support ES5 for now |