Bug 1302707 - Set the default page loading- and script timeout; r?automatedtester draft
authorAndreas Tolfsen <ato@mozilla.com>
Wed, 28 Sep 2016 17:32:36 +0100
changeset 418530 33388dbe27dc188cbf20fc68c8feb84cee021303
parent 418529 a54a21f67a62fc5f279d88ade4207982047f1de0
child 532363 61c272b9f62b469706907011e242f2d21c6881c9
push id30699
push userbmo:ato@mozilla.com
push dateWed, 28 Sep 2016 16:44:24 +0000
reviewersautomatedtester
bugs1302707
milestone52.0a1
Bug 1302707 - Set the default page loading- and script timeout; r?automatedtester The WebDriver specification mandates that the page loading timeout must be five minutes, and the script timeout 30 seconds. MozReview-Commit-ID: E82jGXCb2ch
testing/marionette/driver.js
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -99,19 +99,19 @@ this.GeckoDriver = function(appName, sto
   this.stopSignal_ = stopSignal;
 
   this.sessionId = null;
   this.wins = new browser.Windows();
   this.browsers = {};
   // points to current browser
   this.curBrowser = null;
   this.context = Context.CONTENT;
-  this.scriptTimeout = null;
+  this.scriptTimeout = 30000;  // 30 seconds
   this.searchTimeout = null;
-  this.pageTimeout = null;
+  this.pageTimeout = 300000;  // five minutes
   this.timer = null;
   this.inactivityTimer = null;
   this.marionetteLog = new logging.ContentLogger();
   // topmost chrome frame
   this.mainFrame = null;
   // chrome iframe that currently has focus
   this.curFrame = null;
   this.mainContentFrameId = null;