From f8b732fb993811d8c59d55bf3023d76781941dfb Mon Sep 17 00:00:00 2001 From: Robert Strong Date: Sat, 12 Jan 2013 23:30:11 -0800 Subject: [PATCH] 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 --- .../update/test/unit/test_0200_app_launch_apply_update.js | 2 +- .../update/test/unit/test_0201_app_launch_apply_update.js | 2 +- .../unit/test_0202_app_launch_apply_update_dirlocked.js | 6 ------ .../update/test/unit/test_0203_app_launch_apply_update.js | 3 ++- .../test_svc/unit/test_0200_app_launch_apply_update_svc.js | 4 ---- .../test_svc/unit/test_0201_app_launch_apply_update_svc.js | 2 +- .../unit/test_0202_app_launch_apply_update_dirlocked_svc.js | 4 ---- 7 files changed, 5 insertions(+), 18 deletions(-) diff --git a/toolkit/mozapps/update/test/unit/test_0200_app_launch_apply_update.js b/toolkit/mozapps/update/test/unit/test_0200_app_launch_apply_update.js index 8690d18d0235..6e21b2e8896d 100644 --- a/toolkit/mozapps/update/test/unit/test_0200_app_launch_apply_update.js +++ b/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; diff --git a/toolkit/mozapps/update/test/unit/test_0201_app_launch_apply_update.js b/toolkit/mozapps/update/test/unit/test_0201_app_launch_apply_update.js index 6e363ae21a03..128b410aa2ea 100644 --- a/toolkit/mozapps/update/test/unit/test_0201_app_launch_apply_update.js +++ b/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; diff --git a/toolkit/mozapps/update/test/unit/test_0202_app_launch_apply_update_dirlocked.js b/toolkit/mozapps/update/test/unit/test_0202_app_launch_apply_update_dirlocked.js index 36b12bb4c502..5eb93755739a 100644 --- a/toolkit/mozapps/update/test/unit/test_0202_app_launch_apply_update_dirlocked.js +++ b/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 diff --git a/toolkit/mozapps/update/test/unit/test_0203_app_launch_apply_update.js b/toolkit/mozapps/update/test/unit/test_0203_app_launch_apply_update.js index 954682bb9b08..0bae3543183f 100644 --- a/toolkit/mozapps/update/test/unit/test_0203_app_launch_apply_update.js +++ b/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"); diff --git a/toolkit/mozapps/update/test_svc/unit/test_0200_app_launch_apply_update_svc.js b/toolkit/mozapps/update/test_svc/unit/test_0200_app_launch_apply_update_svc.js index 02fa71f7fe1b..9563b61cba8d 100644 --- a/toolkit/mozapps/update/test_svc/unit/test_0200_app_launch_apply_update_svc.js +++ b/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() { diff --git a/toolkit/mozapps/update/test_svc/unit/test_0201_app_launch_apply_update_svc.js b/toolkit/mozapps/update/test_svc/unit/test_0201_app_launch_apply_update_svc.js index 0527fdbe0013..111e5404d9f3 100644 --- a/toolkit/mozapps/update/test_svc/unit/test_0201_app_launch_apply_update_svc.js +++ b/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; diff --git a/toolkit/mozapps/update/test_svc/unit/test_0202_app_launch_apply_update_dirlocked_svc.js b/toolkit/mozapps/update/test_svc/unit/test_0202_app_launch_apply_update_dirlocked_svc.js index e4a5a4c559fa..f165f357bb68 100644 --- a/toolkit/mozapps/update/test_svc/unit/test_0202_app_launch_apply_update_dirlocked_svc.js +++ b/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;