summaryrefslogtreecommitdiff
path: root/scripts/Util.py
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/Util.py')
-rw-r--r--scripts/Util.py7
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