diff --git a/testing/marionette/client/marionette/marionette.py b/testing/marionette/client/marionette/marionette.py index f08c7a0f0753..abb89a181aa2 100644 --- a/testing/marionette/client/marionette/marionette.py +++ b/testing/marionette/client/marionette/marionette.py @@ -421,7 +421,7 @@ class Marionette(object): return unwrapped - def execute_js_script(self, script, script_args=None, async=True, new_sandbox=True, special_powers=False, script_timeout=None): + def execute_js_script(self, script, script_args=None, async=True, new_sandbox=True, special_powers=False): if script_args is None: script_args = [] args = self.wrapArguments(script_args) @@ -431,11 +431,10 @@ class Marionette(object): args=args, async=async, newSandbox=new_sandbox, - specialPowers=special_powers, - scriptTimeout=script_timeout) + specialPowers=special_powers) return self.unwrapValue(response) - def execute_script(self, script, script_args=None, new_sandbox=True, special_powers=False, script_timeout=None): + def execute_script(self, script, script_args=None, new_sandbox=True, special_powers=False): if script_args is None: script_args = [] args = self.wrapArguments(script_args) @@ -444,11 +443,10 @@ class Marionette(object): value=script, args=args, newSandbox=new_sandbox, - specialPowers=special_powers, - scriptTimeout=script_timeout) + specialPowers=special_powers) return self.unwrapValue(response) - def execute_async_script(self, script, script_args=None, new_sandbox=True, special_powers=False, script_timeout=None): + def execute_async_script(self, script, script_args=None, new_sandbox=True, special_powers=False): if script_args is None: script_args = [] args = self.wrapArguments(script_args) @@ -457,8 +455,7 @@ class Marionette(object): value=script, args=args, newSandbox=new_sandbox, - specialPowers=special_powers, - scriptTimeout=script_timeout) + specialPowers=special_powers) return self.unwrapValue(response) def find_element(self, method, target, id=None): diff --git a/testing/marionette/client/marionette/tests/unit/test_execute_async_script.py b/testing/marionette/client/marionette/tests/unit/test_execute_async_script.py index ec1f84a38062..0263d6ab8c02 100644 --- a/testing/marionette/client/marionette/tests/unit/test_execute_async_script.py +++ b/testing/marionette/client/marionette/tests/unit/test_execute_async_script.py @@ -19,10 +19,6 @@ class TestExecuteAsyncContent(MarionetteTestCase): def test_execute_async_timeout(self): self.assertRaises(ScriptTimeoutException, self.marionette.execute_async_script, "var x = 1;") - def test_execute_async_unique_timeout(self): - self.assertEqual(1, self.marionette.execute_async_script("setTimeout(function() {marionetteScriptFinished(1);}, 2000);", script_timeout=5000)) - self.assertRaises(ScriptTimeoutException, self.marionette.execute_async_script, "setTimeout(function() {marionetteScriptFinished(1);}, 2000);") - def test_no_timeout(self): self.marionette.set_script_timeout(10000) self.assertTrue(self.marionette.execute_async_script(""" @@ -108,3 +104,4 @@ marionetteScriptFinished(1); def test_sandbox_reuse(self): pass + diff --git a/testing/marionette/marionette-actors.js b/testing/marionette/marionette-actors.js index c6083536854e..38de3ea8c12e 100644 --- a/testing/marionette/marionette-actors.js +++ b/testing/marionette/marionette-actors.js @@ -669,10 +669,10 @@ MarionetteDriverActor.prototype = { * True if the script is asynchronous */ executeScriptInSandbox: function MDA_executeScriptInSandbox(sandbox, script, - directInject, async, command_id, timeout) { + directInject, async, command_id) { if (directInject && async && - (timeout == null || timeout == 0)) { + (this.scriptTimeout == null || this.scriptTimeout == 0)) { this.sendError("Please set a timeout", 21, null, command_id); return; } @@ -711,7 +711,6 @@ MarionetteDriverActor.prototype = { * function body */ execute: function MDA_execute(aRequest, directInject) { - let timeout = aRequest.scriptTimeout ? aRequest.scriptTimeout : this.scriptTimeout; let command_id = this.command_id = this.getCommandId(); this.logRequest("execute", aRequest); if (aRequest.newSandbox == undefined) { @@ -723,7 +722,7 @@ MarionetteDriverActor.prototype = { this.sendAsync("executeScript", {value: aRequest.value, args: aRequest.args, newSandbox: aRequest.newSandbox, - timeout: timeout, + timeout: this.scriptTimeout, command_id: command_id}); return; } @@ -731,7 +730,7 @@ MarionetteDriverActor.prototype = { let curWindow = this.getCurrentWindow(); let marionette = new Marionette(this, curWindow, "chrome", this.marionetteLog, this.marionettePerf, - timeout, this.testName); + this.scriptTimeout, this.testName); let _chromeSandbox = this.createExecuteSandbox(curWindow, marionette, aRequest.args, @@ -755,7 +754,7 @@ MarionetteDriverActor.prototype = { "func.apply(null, __marionetteParams);"; } this.executeScriptInSandbox(_chromeSandbox, script, directInject, - false, command_id, timeout); + false, command_id); } catch (e) { this.sendError(e.name + ': ' + e.message, 17, e.stack, command_id); @@ -789,7 +788,6 @@ MarionetteDriverActor.prototype = { * 'timeout' member will be used as the script timeout if it is given */ executeJSScript: function MDA_executeJSScript(aRequest) { - let timeout = aRequest.scriptTimeout ? aRequest.scriptTimeout : this.scriptTimeout; let command_id = this.command_id = this.getCommandId(); //all pure JS scripts will need to call Marionette.finish() to complete the test. if (aRequest.newSandbox == undefined) { @@ -810,7 +808,7 @@ MarionetteDriverActor.prototype = { args: aRequest.args, newSandbox: aRequest.newSandbox, async: aRequest.async, - timeout: timeout, + timeout: this.scriptTimeout, command_id: command_id }); } }, @@ -831,7 +829,6 @@ MarionetteDriverActor.prototype = { * function body */ executeWithCallback: function MDA_executeWithCallback(aRequest, directInject) { - let timeout = aRequest.scriptTimeout ? aRequest.scriptTimeout : this.scriptTimeout; let command_id = this.command_id = this.getCommandId(); if (aRequest.newSandbox == undefined) { //if client does not send a value in newSandbox, @@ -844,7 +841,7 @@ MarionetteDriverActor.prototype = { args: aRequest.args, id: this.command_id, newSandbox: aRequest.newSandbox, - timeout: timeout, + timeout: this.scriptTimeout, command_id: command_id}); return; } @@ -852,10 +849,9 @@ MarionetteDriverActor.prototype = { let curWindow = this.getCurrentWindow(); let original_onerror = curWindow.onerror; let that = this; - that.timeout = timeout; let marionette = new Marionette(this, curWindow, "chrome", this.marionetteLog, this.marionettePerf, - timeout, this.testName); + this.scriptTimeout, this.testName); marionette.command_id = this.command_id; function chromeAsyncReturnFunc(value, status) { @@ -906,7 +902,7 @@ MarionetteDriverActor.prototype = { if (this.timer != null) { this.timer.initWithCallback(function() { chromeAsyncReturnFunc("timed out", 28); - }, that.timeout, Ci.nsITimer.TYPE_ONESHOT); + }, that.scriptTimeout, Ci.nsITimer.TYPE_ONESHOT); } _chromeSandbox.returnFunc = chromeAsyncReturnFunc; @@ -924,7 +920,7 @@ MarionetteDriverActor.prototype = { } this.executeScriptInSandbox(_chromeSandbox, script, directInject, - true, command_id, timeout); + true, command_id); } catch (e) { chromeAsyncReturnFunc(e.name + ": " + e.message, 17); }