Possible fix for Bug 814535 and Bug 774014 - Intermittent test_0201_app_launch_apply_update* and test_0203_app_launch_apply_update* | launch application timer expired. r=bbondy

toolkit/mozapps/update/test/unit/test_0200_app_launch_apply_update.js

@@ -23,7 +23,7 @@ const MAX_TIMEOUT_RUNS = 300;
 
 // Maximum number of milliseconds the process that is launched can run before
 // the test will try to kill it.
-const APP_TIMER_TIMEOUT = 15000;
+const APP_TIMER_TIMEOUT = 20000;
 
 let gAppTimer;
 let gProcess;

toolkit/mozapps/update/test/unit/test_0201_app_launch_apply_update.js

@@ -26,7 +26,7 @@ const MAX_TIMEOUT_RUNS = 300;
 
 // Maximum number of milliseconds the process that is launched can run before
 // the test will try to kill it.
-const APP_TIMER_TIMEOUT = 15000;
+const APP_TIMER_TIMEOUT = 20000;
 
 let gAppTimer;
 let gProcess;

toolkit/mozapps/update/test/unit/test_0202_app_launch_apply_update_dirlocked.js

@@ -27,12 +27,6 @@ const FILE_UPDATER_INI_BAK = "updater.ini.bak";
 // Number of milliseconds for each do_timeout call.
 const CHECK_TIMEOUT_MILLI = 1000;
 
-// Maximum number of milliseconds the process that is launched can run before
-// the test will try to kill it.
-const APP_TIMER_TIMEOUT = 15000;
-
-let gAppTimer;
-let gProcess;
 let gActiveUpdate;
 
 // Override getUpdatesRootDir on Mac because we need to apply the update

toolkit/mozapps/update/test/unit/test_0203_app_launch_apply_update.js

@@ -27,11 +27,12 @@ const FILE_UPDATER_INI_BAK = "updater.ini.bak";
 // Number of milliseconds for each do_timeout call.
 const CHECK_TIMEOUT_MILLI = 1000;
 
+// How many of CHECK_TIMEOUT_MILLI to wait before we abort the test.
 const MAX_TIMEOUT_RUNS = 300;
 
 // Maximum number of milliseconds the process that is launched can run before
 // the test will try to kill it.
-const APP_TIMER_TIMEOUT = 15000;
+const APP_TIMER_TIMEOUT = 20000;
 
 Components.utils.import("resource://gre/modules/ctypes.jsm");
 

toolkit/mozapps/update/test_svc/unit/test_0200_app_launch_apply_update_svc.js

@@ -21,10 +21,6 @@ const CHECK_TIMEOUT_MILLI = 1000;
 // How many of CHECK_TIMEOUT_MILLI to wait before we abort the test.
 const MAX_TIMEOUT_RUNS = 300;
 
-// Maximum number of milliseconds the process that is launched can run before
-// the test will try to kill it.
-const APP_TIMER_TIMEOUT = 15000;
-
 let gTimeoutRuns = 0;
 
 function run_test() {

toolkit/mozapps/update/test_svc/unit/test_0201_app_launch_apply_update_svc.js

@@ -26,7 +26,7 @@ const MAX_TIMEOUT_RUNS = 300;
 
 // Maximum number of milliseconds the process that is launched can run before
 // the test will try to kill it.
-const APP_TIMER_TIMEOUT = 15000;
+const APP_TIMER_TIMEOUT = 20000;
 
 let gAppTimer;
 let gProcess;

toolkit/mozapps/update/test_svc/unit/test_0202_app_launch_apply_update_dirlocked_svc.js

@@ -30,10 +30,6 @@ const CHECK_TIMEOUT_MILLI = 1000;
 // How many of CHECK_TIMEOUT_MILLI to wait before we abort the test.
 const MAX_TIMEOUT_RUNS = 300;
 
-// Maximum number of milliseconds the process that is launched can run before
-// the test will try to kill it.
-const APP_TIMER_TIMEOUT = 15000;
-
 let gActiveUpdate;
 let gTimeoutRuns = 0;