author | Andreas Tolfsen <ato@mozilla.com> |
Tue, 28 Apr 2015 18:59:07 +0100 | |
changeset 241568 | a1eca7bc5d434438096c9736636732059c84f8be |
parent 241567 | b731f1b5297b76ff29e0f989150b0c043f1427f3 |
child 241569 | 786d3ff3e82fc4b0c3945c575a16e2faa1a7cdc2 |
push id | 28665 |
push user | kwierso@gmail.com |
push date | Wed, 29 Apr 2015 23:43:43 +0000 |
treeherder | mozilla-central@a86ed85747d8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1157259 |
milestone | 40.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/testing/marionette/listener.js +++ b/testing/marionette/listener.js @@ -663,17 +663,17 @@ function executeJSScript(msg) { * For executeAsync, it will return a response when marionetteScriptFinished/arguments[arguments.length-1] * method is called, or if it times out. */ function executeWithCallback(msg, useFinish) { // Set up inactivity timeout. if (msg.json.inactivityTimeout) { let setTimer = function() { inactivityTimeoutId = curFrame.setTimeout(function() { - sandbox.asyncComplete(new ScriptTimeout("timed out due to inactivity"), asyncTestCommandId); + sandbox.asyncComplete(new ScriptTimeoutError("timed out due to inactivity"), asyncTestCommandId); }, msg.json.inactivityTimeout); }; setTimer(); heartbeatCallback = function() { curFrame.clearTimeout(inactivityTimeoutId); setTimer(); };