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 355915 ebe183f4b76104ef999c08213d30c6972f52cb96
parent 355914 079142762f427b0a5977832231f210cbe2c7bf05
child 355916 581e2e9b9d79cbaf4e333447e5966e03b92a2eb7
push id6570
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:26:13 +0000
treeherdermozilla-beta@f455459b2ae5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersautomatedtester, test-only
bugs1302707
milestone51.0a2
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;