Bug 1302707 - Set the default page loading- and script timeout. r=automatedtester, a=test-only
authorAndreas Tolfsen <ato@mozilla.com>
Wed, 28 Sep 2016 17:32:36 +0100
changeset 350523 572ea1c382123d5a39343b2829f55b66ba71cb50
parent 350522 b45de44b4003480f2c931685b0f3761c7e0b19ac
child 350524 558394541d48dcf744f6cecee7890890508a5d6b
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersautomatedtester, test-only
bugs1302707
milestone50.0
Bug 1302707 - Set the default page loading- and script timeout. r=automatedtester, a=test-only 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;