Bug 1307127 - Pass along pageTimeout when polling for ready state from chrome; r?automatedtester draft
authorAndreas Tolfsen <ato@mozilla.com>
Wed, 12 Oct 2016 19:54:26 +0100
changeset 424383 bd3085e2c5631063d2cd26065a00094e85a6298f
parent 424323 26f2e65163e9f3cfab071a9823293217b1e1de8d
child 533668 d3cbd45484e00c242cb10f9803d1f96a051a96e9
push id32147
push userbmo:ato@mozilla.com
push dateWed, 12 Oct 2016 19:08:07 +0000
reviewersautomatedtester
bugs1307127
milestone52.0a1
Bug 1307127 - Pass along pageTimeout when polling for ready state from chrome; r?automatedtester The page loading timeout is not included in the message sent to Marionette:pollForReadyState from chrome after a remoteness change occurs. The call is appended to the pending commands and re-issued/flushed when Marionette:listenersAttached fires after a remoteness change. MozReview-Commit-ID: 4UMD4x9ugMA
testing/marionette/driver.js
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -969,16 +969,17 @@ GeckoDriver.prototype.get = function*(cm
       // TODO(ato): Bug 1242595
       let id = this.listener.activeMessageId;
 
       // If a remoteness update interrupts our page load, this will never return
       // We need to re-issue this request to correctly poll for readyState and
       // send errors.
       this.curBrowser.pendingCommands.push(() => {
         cmd.parameters.command_id = id;
+        cmd.parameters.pageTimeout = this.pageTimeout;
         this.mm.broadcastAsyncMessage(
             "Marionette:pollForReadyState" + this.curBrowser.curFrameId,
             cmd.parameters);
       });
 
       yield get;
       break;