Bug 931410 - Increase test default timeout for app update chrome tests. r=bbondy
authorRobert Strong <robert.bugzilla@gmail.com>
Sat, 26 Oct 2013 14:29:17 -0700
changeset 152361 d4f3906dfbdd3f154871c9bcba326563b93cffd8
parent 152360 583e0e090fc7b209d10eeafa361b163cf4f12d38
child 152362 a8a133cc35bea61b85ed47e5866ce041bf4c1d23
push id25532
push userphilringnalda@gmail.com
push dateSun, 27 Oct 2013 01:40:38 +0000
treeherdermozilla-central@a80dce1126db [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbbondy
bugs931410
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 931410 - Increase test default timeout for app update chrome tests. r=bbondy
toolkit/mozapps/update/tests/chrome/test_0017_check_staging_basic.xul
toolkit/mozapps/update/tests/chrome/test_0102_background_restartNotification_staging.xul
toolkit/mozapps/update/tests/chrome/test_0103_background_restartNotification_stagingService.xul
toolkit/mozapps/update/tests/chrome/utils.js
--- a/toolkit/mozapps/update/tests/chrome/test_0017_check_staging_basic.xul
+++ b/toolkit/mozapps/update/tests/chrome/test_0017_check_staging_basic.xul
@@ -34,18 +34,16 @@ const TESTS = [ {
 function runTest() {
   debugDump("entering");
 
   Services.prefs.setBoolPref(PREF_APP_UPDATE_STAGING_ENABLED, true);
 
   let url = URL_HTTP_UPDATE_XML + "?showDetails=1" + getVersionParams();
   setUpdateURLOverride(url);
 
-  setupTimer(180000); // 180 seconds
-
   gUP.checkForUpdates();
 }
 
 ]]>
 </script>
 
 <body xmlns="http://www.w3.org/1999/xhtml">
   <p id="display"></p>
--- a/toolkit/mozapps/update/tests/chrome/test_0102_background_restartNotification_staging.xul
+++ b/toolkit/mozapps/update/tests/chrome/test_0102_background_restartNotification_staging.xul
@@ -28,18 +28,16 @@ function runTest() {
   debugDump("entering");
 
   Services.prefs.setBoolPref(PREF_APP_UPDATE_STAGING_ENABLED, true);
   Services.prefs.setIntPref(PREF_APP_UPDATE_PROMPTWAITTIME, 1);
 
   let url = URL_HTTP_UPDATE_XML + "?showDetails=1" + getVersionParams();
   setUpdateURLOverride(url);
 
-  setupTimer(180000); // 180 seconds
-
   gAUS.notify(null);
 }
 
 ]]>
 </script>
 
 <body xmlns="http://www.w3.org/1999/xhtml">
   <p id="display"></p>
--- a/toolkit/mozapps/update/tests/chrome/test_0103_background_restartNotification_stagingService.xul
+++ b/toolkit/mozapps/update/tests/chrome/test_0103_background_restartNotification_stagingService.xul
@@ -29,18 +29,16 @@ function runTest() {
 
   Services.prefs.setBoolPref(PREF_APP_UPDATE_STAGING_ENABLED, true);
   Services.prefs.setBoolPref(PREF_APP_UPDATE_SERVICE_ENABLED, true);
   Services.prefs.setIntPref(PREF_APP_UPDATE_PROMPTWAITTIME, 1);
 
   let url = URL_HTTP_UPDATE_XML + "?showDetails=1" + getVersionParams();
   setUpdateURLOverride(url);
 
-  setupTimer(180000); // 180 seconds
-
   gAUS.notify(null);
 }
 
 ]]>
 </script>
 
 <body xmlns="http://www.w3.org/1999/xhtml">
   <p id="display"></p>
--- a/toolkit/mozapps/update/tests/chrome/utils.js
+++ b/toolkit/mozapps/update/tests/chrome/utils.js
@@ -158,17 +158,17 @@ const TEST_ADDONS = [ "appdisabled_1", "
                       "compatible_1", "compatible_2",
                       "noupdate_1", "noupdate_2",
                       "updatecompatibility_1", "updatecompatibility_2",
                       "updateversion_1", "updateversion_2",
                       "userdisabled_1", "userdisabled_2", "hotfix" ];
 
 var gURLData = URL_HOST + "/" + REL_PATH_DATA + "/";
 
-var gTestTimeout = 45000; // 45 seconds
+var gTestTimeout = 240000; // 4 minutes
 var gTimeoutTimer;
 
 // The number of SimpleTest.executeSoon calls to perform when waiting on an
 // update window to close before giving up.
 const CLOSE_WINDOW_TIMEOUT_MAXCOUNT = 10;
 // Counter for the SimpleTest.executeSoon when waiting on an update window to
 // close before giving up.
 var gCloseWindowTimeoutCounter = 0;