From 5598eba70d24b994ef61c60a86ddb3362814523d Mon Sep 17 00:00:00 2001 From: Robert Strong Date: Mon, 30 Sep 2013 14:54:38 -0700 Subject: [PATCH] Bug 879612 - Move app update common xpcshell test code into head_update.js.in. r=bbondy --- toolkit/mozapps/update/test/unit/head_update.js.in | 12 ++---------- .../mozapps/update/test/unit/test_0010_general.js | 2 +- .../mozapps/update/test/unit/test_0020_general.js | 2 +- .../mozapps/update/test/unit/test_0030_general.js | 2 +- .../mozapps/update/test/unit/test_0040_general.js | 2 +- .../mozapps/update/test/unit/test_0050_general.js | 2 +- .../mozapps/update/test/unit/test_0060_manager.js | 2 +- .../mozapps/update/test/unit/test_0061_manager.js | 2 +- .../mozapps/update/test/unit/test_0062_manager.js | 2 +- .../mozapps/update/test/unit/test_0063_manager.js | 2 +- .../mozapps/update/test/unit/test_0064_manager.js | 2 +- .../update/test/unit/test_0070_update_dir_cleanup.js | 2 +- .../update/test/unit/test_0071_update_dir_cleanup.js | 2 +- .../update/test/unit/test_0072_update_dir_cleanup.js | 2 +- .../update/test/unit/test_0073_update_dir_cleanup.js | 2 +- .../update/test/unit/test_0080_prompt_silent.js | 2 +- .../test/unit/test_0081_prompt_uiAlreadyOpen.js | 2 +- .../test_0082_prompt_unsupportAlreadyNotified.js | 2 +- .../mozapps/update/test/unit/test_0110_general.js | 6 +++++- .../mozapps/update/test/unit/test_0111_general.js | 6 +++++- .../mozapps/update/test/unit/test_0112_general.js | 6 +++++- .../mozapps/update/test/unit/test_0113_general.js | 6 +++++- .../test/unit/test_0113_versionDowngradeCheck.js | 9 ++++++--- .../mozapps/update/test/unit/test_0114_general.js | 6 +++++- .../test/unit/test_0114_productChannelCheck.js | 6 +++++- .../mozapps/update/test/unit/test_0115_general.js | 9 ++++++++- .../unit/test_0150_appBinReplaced_xp_win_complete.js | 6 +++++- .../unit/test_0151_appBinPatched_xp_win_partial.js | 6 +++++- .../unit/test_0152_appBinReplaced_xp_win_complete.js | 6 +++++- .../unit/test_0153_appBinPatched_xp_win_partial.js | 6 +++++- .../update/test/unit/test_0160_appInUse_complete.js | 7 ++++++- .../test/unit/test_0161_appInUse_xp_unix_complete.js | 7 ++++++- .../test/unit/test_0161_appInUse_xp_win_complete.js | 6 +++++- .../test/unit/test_0162_appInUse_xp_win_complete.js | 6 +++++- .../unit/test_0170_fileLocked_xp_win_complete.js | 6 +++++- .../test/unit/test_0171_fileLocked_xp_win_partial.js | 6 +++++- .../unit/test_0172_fileLocked_xp_win_complete.js | 6 +++++- .../test/unit/test_0173_fileLocked_xp_win_partial.js | 6 +++++- .../unit/test_0174_fileLocked_xp_win_complete.js | 6 +++++- .../test/unit/test_0175_fileLocked_xp_win_partial.js | 6 +++++- .../test/unit/test_0180_fileInUse_xp_win_complete.js | 6 +++++- .../test/unit/test_0181_fileInUse_xp_win_partial.js | 6 +++++- .../test_0182_rmrfdirFileInUse_xp_win_complete.js | 6 +++++- .../test_0183_rmrfdirFileInUse_xp_win_partial.js | 6 +++++- .../test/unit/test_0184_fileInUse_xp_win_complete.js | 6 +++++- .../test/unit/test_0185_fileInUse_xp_win_partial.js | 6 +++++- .../test_0186_rmrfdirFileInUse_xp_win_complete.js | 6 +++++- .../test_0187_rmrfdirFileInUse_xp_win_partial.js | 6 +++++- .../test/unit/test_0188_fileInUse_xp_win_complete.js | 6 +++++- .../test/unit/test_0189_fileInUse_xp_win_partial.js | 6 +++++- .../test_0190_rmrfdirFileInUse_xp_win_complete.js | 6 +++++- .../test_0191_rmrfdirFileInUse_xp_win_partial.js | 6 +++++- toolkit/mozapps/update/test/unit/test_bug595059.js | 2 +- toolkit/mozapps/update/test/unit/test_bug794211.js | 2 +- toolkit/mozapps/update/test/unit/test_bug833708.js | 2 +- 55 files changed, 198 insertions(+), 66 deletions(-) diff --git a/toolkit/mozapps/update/test/unit/head_update.js.in b/toolkit/mozapps/update/test/unit/head_update.js.in index ca2a10e8913c..e2fa3d294cb0 100644 --- a/toolkit/mozapps/update/test/unit/head_update.js.in +++ b/toolkit/mozapps/update/test/unit/head_update.js.in @@ -1164,16 +1164,6 @@ function setupUpdaterTest(aMarFile) { let afterApplyBinDir = getApplyDirFile("a/b/", true); helperBin.copyTo(afterApplyBinDir, gCallbackBinFile); - if (!gBackgroundUpdate && !gSwitchApp) { - let updaterIniContents = "[Strings]\n" + - "Title=Update XPCShell Test\n" + - "Info=Application Update Test - " + TEST_ID + "\n"; - let updaterIni = updatesDir.clone(); - updaterIni.append(FILE_UPDATER_INI); - writeFile(updaterIni, updaterIniContents); - updaterIni.copyTo(afterApplyBinDir, FILE_UPDATER_INI); - } - // Copy the mar that will be applied let mar = do_get_file(aMarFile); mar.copyTo(updatesDir, FILE_UPDATE_ARCHIVE); @@ -2240,6 +2230,8 @@ function adjustGeneralPaths() { let ds = Services.dirsvc.QueryInterface(AUS_Ci.nsIDirectoryService); ds.registerProvider(dirProvider); do_register_cleanup(function() { + // Call end_test first before the directory provider is unregistered + end_test(); ds.unregisterProvider(dirProvider); let testBin = do_get_file(getApplyDirPath() + "test" + APP_BIN_SUFFIX, true); // Try to remove the test.bin file if it exists (it shouldn't). diff --git a/toolkit/mozapps/update/test/unit/test_0010_general.js b/toolkit/mozapps/update/test/unit/test_0010_general.js index 03f65f05a7f5..8bb3b3a102b2 100644 --- a/toolkit/mozapps/update/test/unit/test_0010_general.js +++ b/toolkit/mozapps/update/test/unit/test_0010_general.js @@ -9,8 +9,8 @@ const TEST_ID = "0010"; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); // Verify write access to the custom app dir diff --git a/toolkit/mozapps/update/test/unit/test_0020_general.js b/toolkit/mozapps/update/test/unit/test_0020_general.js index 2439f529c2d1..3e64046b7487 100644 --- a/toolkit/mozapps/update/test/unit/test_0020_general.js +++ b/toolkit/mozapps/update/test/unit/test_0020_general.js @@ -12,8 +12,8 @@ var gExpectedCount; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); removeUpdateDirsAndFiles(); diff --git a/toolkit/mozapps/update/test/unit/test_0030_general.js b/toolkit/mozapps/update/test/unit/test_0030_general.js index 3def9ba607d6..58caa6748adc 100644 --- a/toolkit/mozapps/update/test/unit/test_0030_general.js +++ b/toolkit/mozapps/update/test/unit/test_0030_general.js @@ -23,8 +23,8 @@ var gIncrementalDownloadErrorType = 0; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); Services.prefs.setBoolPref(PREF_APP_UPDATE_STAGING_ENABLED, false); diff --git a/toolkit/mozapps/update/test/unit/test_0040_general.js b/toolkit/mozapps/update/test/unit/test_0040_general.js index c710f2d43675..1ec2929a7edf 100644 --- a/toolkit/mozapps/update/test/unit/test_0040_general.js +++ b/toolkit/mozapps/update/test/unit/test_0040_general.js @@ -15,8 +15,8 @@ var gAppInfo; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); removeUpdateDirsAndFiles(); diff --git a/toolkit/mozapps/update/test/unit/test_0050_general.js b/toolkit/mozapps/update/test/unit/test_0050_general.js index a8d474f49a5f..8e2b08939df0 100644 --- a/toolkit/mozapps/update/test/unit/test_0050_general.js +++ b/toolkit/mozapps/update/test/unit/test_0050_general.js @@ -19,8 +19,8 @@ var gExpectedStatusText; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); removeUpdateDirsAndFiles(); diff --git a/toolkit/mozapps/update/test/unit/test_0060_manager.js b/toolkit/mozapps/update/test/unit/test_0060_manager.js index ef809a443b12..16b13b5f758b 100644 --- a/toolkit/mozapps/update/test/unit/test_0060_manager.js +++ b/toolkit/mozapps/update/test/unit/test_0060_manager.js @@ -9,8 +9,8 @@ const TEST_ID = "0060"; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); logTestInfo("testing addition of a successful update to " + FILE_UPDATES_DB + diff --git a/toolkit/mozapps/update/test/unit/test_0061_manager.js b/toolkit/mozapps/update/test/unit/test_0061_manager.js index 536040a055ce..17806c166055 100644 --- a/toolkit/mozapps/update/test/unit/test_0061_manager.js +++ b/toolkit/mozapps/update/test/unit/test_0061_manager.js @@ -9,8 +9,8 @@ const TEST_ID = "0061"; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); logTestInfo("testing removal of an update download in progress for an " + diff --git a/toolkit/mozapps/update/test/unit/test_0062_manager.js b/toolkit/mozapps/update/test/unit/test_0062_manager.js index d5cf4a381fd5..56f91aee2e75 100644 --- a/toolkit/mozapps/update/test/unit/test_0062_manager.js +++ b/toolkit/mozapps/update/test/unit/test_0062_manager.js @@ -9,8 +9,8 @@ const TEST_ID = "0062"; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); logTestInfo("testing resuming an update download in progress for the same " + diff --git a/toolkit/mozapps/update/test/unit/test_0063_manager.js b/toolkit/mozapps/update/test/unit/test_0063_manager.js index e85969629389..a9ccb91ea6fe 100644 --- a/toolkit/mozapps/update/test/unit/test_0063_manager.js +++ b/toolkit/mozapps/update/test/unit/test_0063_manager.js @@ -9,8 +9,8 @@ const TEST_ID = "0063"; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); logTestInfo("testing removing an active update for a channel that is not" + diff --git a/toolkit/mozapps/update/test/unit/test_0064_manager.js b/toolkit/mozapps/update/test/unit/test_0064_manager.js index 22012ec8c698..5b45e45b52cc 100644 --- a/toolkit/mozapps/update/test/unit/test_0064_manager.js +++ b/toolkit/mozapps/update/test/unit/test_0064_manager.js @@ -9,8 +9,8 @@ const TEST_ID = "0064"; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); logTestInfo("testing removal of an update download in progress for the " + diff --git a/toolkit/mozapps/update/test/unit/test_0070_update_dir_cleanup.js b/toolkit/mozapps/update/test/unit/test_0070_update_dir_cleanup.js index 843bcd6abe60..4f7d8d26e2c2 100644 --- a/toolkit/mozapps/update/test/unit/test_0070_update_dir_cleanup.js +++ b/toolkit/mozapps/update/test/unit/test_0070_update_dir_cleanup.js @@ -9,8 +9,8 @@ const TEST_ID = "0070"; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); removeUpdateDirsAndFiles(); diff --git a/toolkit/mozapps/update/test/unit/test_0071_update_dir_cleanup.js b/toolkit/mozapps/update/test/unit/test_0071_update_dir_cleanup.js index 3b665111b6fa..5350da62d992 100644 --- a/toolkit/mozapps/update/test/unit/test_0071_update_dir_cleanup.js +++ b/toolkit/mozapps/update/test/unit/test_0071_update_dir_cleanup.js @@ -9,8 +9,8 @@ const TEST_ID = "0071"; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); removeUpdateDirsAndFiles(); diff --git a/toolkit/mozapps/update/test/unit/test_0072_update_dir_cleanup.js b/toolkit/mozapps/update/test/unit/test_0072_update_dir_cleanup.js index 43ce7eaf06a1..73b8b43941dd 100644 --- a/toolkit/mozapps/update/test/unit/test_0072_update_dir_cleanup.js +++ b/toolkit/mozapps/update/test/unit/test_0072_update_dir_cleanup.js @@ -8,8 +8,8 @@ const TEST_ID = "0072"; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); removeUpdateDirsAndFiles(); diff --git a/toolkit/mozapps/update/test/unit/test_0073_update_dir_cleanup.js b/toolkit/mozapps/update/test/unit/test_0073_update_dir_cleanup.js index 286dd2345259..a464107a19d2 100644 --- a/toolkit/mozapps/update/test/unit/test_0073_update_dir_cleanup.js +++ b/toolkit/mozapps/update/test/unit/test_0073_update_dir_cleanup.js @@ -8,8 +8,8 @@ const TEST_ID = "0073"; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); removeUpdateDirsAndFiles(); diff --git a/toolkit/mozapps/update/test/unit/test_0080_prompt_silent.js b/toolkit/mozapps/update/test/unit/test_0080_prompt_silent.js index 8dd9b4f77fa7..f82bab13c837 100644 --- a/toolkit/mozapps/update/test/unit/test_0080_prompt_silent.js +++ b/toolkit/mozapps/update/test/unit/test_0080_prompt_silent.js @@ -12,8 +12,8 @@ const TEST_ID = "0080"; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); logTestInfo("testing nsIUpdatePrompt notifications should not be seen " + diff --git a/toolkit/mozapps/update/test/unit/test_0081_prompt_uiAlreadyOpen.js b/toolkit/mozapps/update/test/unit/test_0081_prompt_uiAlreadyOpen.js index 99066c85cd58..f7bdb0b08fe8 100644 --- a/toolkit/mozapps/update/test/unit/test_0081_prompt_uiAlreadyOpen.js +++ b/toolkit/mozapps/update/test/unit/test_0081_prompt_uiAlreadyOpen.js @@ -11,8 +11,8 @@ const TEST_ID = "0081"; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); logTestInfo("testing nsIUpdatePrompt notifications should not be seen when " + diff --git a/toolkit/mozapps/update/test/unit/test_0082_prompt_unsupportAlreadyNotified.js b/toolkit/mozapps/update/test/unit/test_0082_prompt_unsupportAlreadyNotified.js index a050fb665de5..4980da9f2878 100644 --- a/toolkit/mozapps/update/test/unit/test_0082_prompt_unsupportAlreadyNotified.js +++ b/toolkit/mozapps/update/test/unit/test_0082_prompt_unsupportAlreadyNotified.js @@ -11,8 +11,8 @@ const TEST_ID = "0082"; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); removeUpdateDirsAndFiles(); diff --git a/toolkit/mozapps/update/test/unit/test_0110_general.js b/toolkit/mozapps/update/test/unit/test_0110_general.js index aee93135c1a6..71e24b5048d3 100644 --- a/toolkit/mozapps/update/test/unit/test_0110_general.js +++ b/toolkit/mozapps/update/test/unit/test_0110_general.js @@ -236,8 +236,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); setupUpdaterTest(MAR_COMPLETE_FILE); @@ -286,3 +286,7 @@ function run_test() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0111_general.js b/toolkit/mozapps/update/test/unit/test_0111_general.js index 859f4402eb2d..d45678e0abf5 100644 --- a/toolkit/mozapps/update/test/unit/test_0111_general.js +++ b/toolkit/mozapps/update/test/unit/test_0111_general.js @@ -238,8 +238,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); setupUpdaterTest(MAR_PARTIAL_FILE); @@ -287,3 +287,7 @@ function run_test() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0112_general.js b/toolkit/mozapps/update/test/unit/test_0112_general.js index 9eecf5060fca..5540ee042a82 100644 --- a/toolkit/mozapps/update/test/unit/test_0112_general.js +++ b/toolkit/mozapps/update/test/unit/test_0112_general.js @@ -231,8 +231,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); setupUpdaterTest(MAR_PARTIAL_FILE); @@ -283,3 +283,7 @@ function run_test() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0113_general.js b/toolkit/mozapps/update/test/unit/test_0113_general.js index 7ba89a39069e..3c6da8e2c739 100644 --- a/toolkit/mozapps/update/test/unit/test_0113_general.js +++ b/toolkit/mozapps/update/test/unit/test_0113_general.js @@ -269,8 +269,8 @@ function checkSymlink() { function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -383,3 +383,7 @@ function run_test() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0113_versionDowngradeCheck.js b/toolkit/mozapps/update/test/unit/test_0113_versionDowngradeCheck.js index 8a2c2b32aa39..1f89561e8f83 100644 --- a/toolkit/mozapps/update/test/unit/test_0113_versionDowngradeCheck.js +++ b/toolkit/mozapps/update/test/unit/test_0113_versionDowngradeCheck.js @@ -18,11 +18,10 @@ function run_test() { return; } - // Setup an old version MAR file - do_register_cleanup(cleanupUpdaterTest); - + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); + // Setup an old version MAR file setupUpdaterTest(MAR_OLD_VERSION_FILE); // Apply the MAR @@ -40,3 +39,7 @@ function run_test() { let updateStatus = readStatusFile(updatesDir); do_check_eq(updateStatus.split(": ")[1], VERSION_DOWNGRADE_ERROR); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0114_general.js b/toolkit/mozapps/update/test/unit/test_0114_general.js index c23c92f696b9..94643dacb9dd 100644 --- a/toolkit/mozapps/update/test/unit/test_0114_general.js +++ b/toolkit/mozapps/update/test/unit/test_0114_general.js @@ -238,8 +238,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -328,3 +328,7 @@ function run_test() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0114_productChannelCheck.js b/toolkit/mozapps/update/test/unit/test_0114_productChannelCheck.js index 5b1ce06e3a6e..5d5391749c68 100644 --- a/toolkit/mozapps/update/test/unit/test_0114_productChannelCheck.js +++ b/toolkit/mozapps/update/test/unit/test_0114_productChannelCheck.js @@ -18,10 +18,10 @@ function run_test() { return; } + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); // Setup a wrong channel MAR file - do_register_cleanup(cleanupUpdaterTest); setupUpdaterTest(MAR_WRONG_CHANNEL_FILE); // Apply the MAR @@ -39,3 +39,7 @@ function run_test() { let updateStatus = readStatusFile(updatesDir); do_check_eq(updateStatus.split(": ")[1], MAR_CHANNEL_MISMATCH_ERROR); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0115_general.js b/toolkit/mozapps/update/test/unit/test_0115_general.js index f64957753fed..373d82fbd618 100644 --- a/toolkit/mozapps/update/test/unit/test_0115_general.js +++ b/toolkit/mozapps/update/test/unit/test_0115_general.js @@ -230,8 +230,9 @@ ADDITIONAL_TEST_DIRS = [ }]; function run_test() { - do_register_cleanup(cleanupUpdaterTest); + do_test_pending(); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -282,4 +283,10 @@ function run_test() { do_check_false(toBeDeletedDir.exists()); toBeDeletedDir = getTargetDirFile("tobedeleted", true); do_check_false(toBeDeletedDir.exists()); + + do_test_finished(); +} + +function end_test() { + cleanupUpdaterTest(); } diff --git a/toolkit/mozapps/update/test/unit/test_0150_appBinReplaced_xp_win_complete.js b/toolkit/mozapps/update/test/unit/test_0150_appBinReplaced_xp_win_complete.js index afa1462b1590..8822d52d4642 100644 --- a/toolkit/mozapps/update/test/unit/test_0150_appBinReplaced_xp_win_complete.js +++ b/toolkit/mozapps/update/test/unit/test_0150_appBinReplaced_xp_win_complete.js @@ -192,8 +192,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); setupUpdaterTest(MAR_COMPLETE_WIN_FILE); @@ -218,3 +218,7 @@ function run_test() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0151_appBinPatched_xp_win_partial.js b/toolkit/mozapps/update/test/unit/test_0151_appBinPatched_xp_win_partial.js index 5339187a3fc5..73a09b8fc6d1 100644 --- a/toolkit/mozapps/update/test/unit/test_0151_appBinPatched_xp_win_partial.js +++ b/toolkit/mozapps/update/test/unit/test_0151_appBinPatched_xp_win_partial.js @@ -194,8 +194,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); setupUpdaterTest(MAR_IN_USE_WIN_FILE); @@ -220,3 +220,7 @@ function run_test() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0152_appBinReplaced_xp_win_complete.js b/toolkit/mozapps/update/test/unit/test_0152_appBinReplaced_xp_win_complete.js index 58f751a32274..42e140584b3d 100644 --- a/toolkit/mozapps/update/test/unit/test_0152_appBinReplaced_xp_win_complete.js +++ b/toolkit/mozapps/update/test/unit/test_0152_appBinReplaced_xp_win_complete.js @@ -192,8 +192,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -230,3 +230,7 @@ function run_test() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0153_appBinPatched_xp_win_partial.js b/toolkit/mozapps/update/test/unit/test_0153_appBinPatched_xp_win_partial.js index 3fac65494ba5..573af16b9fe6 100644 --- a/toolkit/mozapps/update/test/unit/test_0153_appBinPatched_xp_win_partial.js +++ b/toolkit/mozapps/update/test/unit/test_0153_appBinPatched_xp_win_partial.js @@ -194,8 +194,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -232,3 +232,7 @@ function run_test() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0160_appInUse_complete.js b/toolkit/mozapps/update/test/unit/test_0160_appInUse_complete.js index c559989c933f..637b12632166 100644 --- a/toolkit/mozapps/update/test/unit/test_0160_appInUse_complete.js +++ b/toolkit/mozapps/update/test/unit/test_0160_appInUse_complete.js @@ -235,8 +235,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); setupUpdaterTest(MAR_COMPLETE_FILE); @@ -301,3 +301,8 @@ function checkUpdate() { checkCallbackAppLog(); } + + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0161_appInUse_xp_unix_complete.js b/toolkit/mozapps/update/test/unit/test_0161_appInUse_xp_unix_complete.js index 68d5bdc74787..9f1aead10a3f 100644 --- a/toolkit/mozapps/update/test/unit/test_0161_appInUse_xp_unix_complete.js +++ b/toolkit/mozapps/update/test/unit/test_0161_appInUse_xp_unix_complete.js @@ -235,8 +235,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -328,3 +328,8 @@ function doUpdate() { function checkUpdate() { checkCallbackAppLog(); } + + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0161_appInUse_xp_win_complete.js b/toolkit/mozapps/update/test/unit/test_0161_appInUse_xp_win_complete.js index f426aaa6e4b5..e5d9dac4cbc8 100644 --- a/toolkit/mozapps/update/test/unit/test_0161_appInUse_xp_win_complete.js +++ b/toolkit/mozapps/update/test/unit/test_0161_appInUse_xp_win_complete.js @@ -185,8 +185,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -242,3 +242,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0162_appInUse_xp_win_complete.js b/toolkit/mozapps/update/test/unit/test_0162_appInUse_xp_win_complete.js index 8508c63b1be5..5958a9ae164c 100644 --- a/toolkit/mozapps/update/test/unit/test_0162_appInUse_xp_win_complete.js +++ b/toolkit/mozapps/update/test/unit/test_0162_appInUse_xp_win_complete.js @@ -185,8 +185,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -239,3 +239,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0170_fileLocked_xp_win_complete.js b/toolkit/mozapps/update/test/unit/test_0170_fileLocked_xp_win_complete.js index 6e0567242eda..493b3257818a 100644 --- a/toolkit/mozapps/update/test/unit/test_0170_fileLocked_xp_win_complete.js +++ b/toolkit/mozapps/update/test/unit/test_0170_fileLocked_xp_win_complete.js @@ -185,8 +185,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); setupUpdaterTest(MAR_COMPLETE_FILE); @@ -236,3 +236,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0171_fileLocked_xp_win_partial.js b/toolkit/mozapps/update/test/unit/test_0171_fileLocked_xp_win_partial.js index 0cbacdb779c8..994867017da1 100644 --- a/toolkit/mozapps/update/test/unit/test_0171_fileLocked_xp_win_partial.js +++ b/toolkit/mozapps/update/test/unit/test_0171_fileLocked_xp_win_partial.js @@ -186,8 +186,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); setupUpdaterTest(MAR_PARTIAL_FILE); @@ -237,3 +237,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0172_fileLocked_xp_win_complete.js b/toolkit/mozapps/update/test/unit/test_0172_fileLocked_xp_win_complete.js index 0baa3f7a5b2b..16f3a4ccf006 100644 --- a/toolkit/mozapps/update/test/unit/test_0172_fileLocked_xp_win_complete.js +++ b/toolkit/mozapps/update/test/unit/test_0172_fileLocked_xp_win_complete.js @@ -185,8 +185,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -250,3 +250,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0173_fileLocked_xp_win_partial.js b/toolkit/mozapps/update/test/unit/test_0173_fileLocked_xp_win_partial.js index 53eed9e46fbb..146379f7cb47 100644 --- a/toolkit/mozapps/update/test/unit/test_0173_fileLocked_xp_win_partial.js +++ b/toolkit/mozapps/update/test/unit/test_0173_fileLocked_xp_win_partial.js @@ -186,8 +186,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -251,3 +251,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0174_fileLocked_xp_win_complete.js b/toolkit/mozapps/update/test/unit/test_0174_fileLocked_xp_win_complete.js index 18e15faf126d..cc0d45cbd8ed 100644 --- a/toolkit/mozapps/update/test/unit/test_0174_fileLocked_xp_win_complete.js +++ b/toolkit/mozapps/update/test/unit/test_0174_fileLocked_xp_win_complete.js @@ -185,8 +185,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -247,3 +247,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0175_fileLocked_xp_win_partial.js b/toolkit/mozapps/update/test/unit/test_0175_fileLocked_xp_win_partial.js index 55ae24b86540..b7838b4f8125 100644 --- a/toolkit/mozapps/update/test/unit/test_0175_fileLocked_xp_win_partial.js +++ b/toolkit/mozapps/update/test/unit/test_0175_fileLocked_xp_win_partial.js @@ -186,8 +186,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -248,3 +248,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0180_fileInUse_xp_win_complete.js b/toolkit/mozapps/update/test/unit/test_0180_fileInUse_xp_win_complete.js index baca04c313b8..3ae376e22089 100644 --- a/toolkit/mozapps/update/test/unit/test_0180_fileInUse_xp_win_complete.js +++ b/toolkit/mozapps/update/test/unit/test_0180_fileInUse_xp_win_complete.js @@ -191,8 +191,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); setupUpdaterTest(MAR_COMPLETE_FILE); @@ -233,3 +233,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0181_fileInUse_xp_win_partial.js b/toolkit/mozapps/update/test/unit/test_0181_fileInUse_xp_win_partial.js index e2adcdf51623..c13a29dfed17 100644 --- a/toolkit/mozapps/update/test/unit/test_0181_fileInUse_xp_win_partial.js +++ b/toolkit/mozapps/update/test/unit/test_0181_fileInUse_xp_win_partial.js @@ -194,8 +194,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); setupUpdaterTest(MAR_IN_USE_WIN_FILE); @@ -236,3 +236,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0182_rmrfdirFileInUse_xp_win_complete.js b/toolkit/mozapps/update/test/unit/test_0182_rmrfdirFileInUse_xp_win_complete.js index f954cf8fa945..a926960e6e0b 100644 --- a/toolkit/mozapps/update/test/unit/test_0182_rmrfdirFileInUse_xp_win_complete.js +++ b/toolkit/mozapps/update/test/unit/test_0182_rmrfdirFileInUse_xp_win_complete.js @@ -191,8 +191,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); setupUpdaterTest(MAR_COMPLETE_FILE); @@ -243,3 +243,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0183_rmrfdirFileInUse_xp_win_partial.js b/toolkit/mozapps/update/test/unit/test_0183_rmrfdirFileInUse_xp_win_partial.js index 89cec8b25fc9..adda2899431a 100644 --- a/toolkit/mozapps/update/test/unit/test_0183_rmrfdirFileInUse_xp_win_partial.js +++ b/toolkit/mozapps/update/test/unit/test_0183_rmrfdirFileInUse_xp_win_partial.js @@ -234,8 +234,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); setupUpdaterTest(MAR_IN_USE_WIN_FILE); @@ -284,3 +284,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0184_fileInUse_xp_win_complete.js b/toolkit/mozapps/update/test/unit/test_0184_fileInUse_xp_win_complete.js index 15560d322646..94690e634bf2 100644 --- a/toolkit/mozapps/update/test/unit/test_0184_fileInUse_xp_win_complete.js +++ b/toolkit/mozapps/update/test/unit/test_0184_fileInUse_xp_win_complete.js @@ -191,8 +191,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -247,3 +247,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0185_fileInUse_xp_win_partial.js b/toolkit/mozapps/update/test/unit/test_0185_fileInUse_xp_win_partial.js index f16e6cf72801..d390c091c646 100644 --- a/toolkit/mozapps/update/test/unit/test_0185_fileInUse_xp_win_partial.js +++ b/toolkit/mozapps/update/test/unit/test_0185_fileInUse_xp_win_partial.js @@ -194,8 +194,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -250,3 +250,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0186_rmrfdirFileInUse_xp_win_complete.js b/toolkit/mozapps/update/test/unit/test_0186_rmrfdirFileInUse_xp_win_complete.js index 09df701c54f6..c18f8a2f9970 100644 --- a/toolkit/mozapps/update/test/unit/test_0186_rmrfdirFileInUse_xp_win_complete.js +++ b/toolkit/mozapps/update/test/unit/test_0186_rmrfdirFileInUse_xp_win_complete.js @@ -191,8 +191,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -256,3 +256,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0187_rmrfdirFileInUse_xp_win_partial.js b/toolkit/mozapps/update/test/unit/test_0187_rmrfdirFileInUse_xp_win_partial.js index ac73b6aa26f1..311e762b534d 100644 --- a/toolkit/mozapps/update/test/unit/test_0187_rmrfdirFileInUse_xp_win_partial.js +++ b/toolkit/mozapps/update/test/unit/test_0187_rmrfdirFileInUse_xp_win_partial.js @@ -234,8 +234,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -297,3 +297,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0188_fileInUse_xp_win_complete.js b/toolkit/mozapps/update/test/unit/test_0188_fileInUse_xp_win_complete.js index a443d5af1c08..416846aa736c 100644 --- a/toolkit/mozapps/update/test/unit/test_0188_fileInUse_xp_win_complete.js +++ b/toolkit/mozapps/update/test/unit/test_0188_fileInUse_xp_win_complete.js @@ -191,8 +191,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -246,3 +246,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0189_fileInUse_xp_win_partial.js b/toolkit/mozapps/update/test/unit/test_0189_fileInUse_xp_win_partial.js index c715129f20b3..22e4c84b1732 100644 --- a/toolkit/mozapps/update/test/unit/test_0189_fileInUse_xp_win_partial.js +++ b/toolkit/mozapps/update/test/unit/test_0189_fileInUse_xp_win_partial.js @@ -194,8 +194,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -249,3 +249,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0190_rmrfdirFileInUse_xp_win_complete.js b/toolkit/mozapps/update/test/unit/test_0190_rmrfdirFileInUse_xp_win_complete.js index 6fa9b8acccd8..a7430708af1f 100644 --- a/toolkit/mozapps/update/test/unit/test_0190_rmrfdirFileInUse_xp_win_complete.js +++ b/toolkit/mozapps/update/test/unit/test_0190_rmrfdirFileInUse_xp_win_complete.js @@ -191,8 +191,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -255,3 +255,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_0191_rmrfdirFileInUse_xp_win_partial.js b/toolkit/mozapps/update/test/unit/test_0191_rmrfdirFileInUse_xp_win_partial.js index 7546060fd7d8..5325fbcb946d 100644 --- a/toolkit/mozapps/update/test/unit/test_0191_rmrfdirFileInUse_xp_win_partial.js +++ b/toolkit/mozapps/update/test/unit/test_0191_rmrfdirFileInUse_xp_win_partial.js @@ -234,8 +234,8 @@ ADDITIONAL_TEST_DIRS = [ function run_test() { do_test_pending(); - do_register_cleanup(cleanupUpdaterTest); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); gBackgroundUpdate = true; @@ -296,3 +296,7 @@ function checkUpdate() { checkCallbackAppLog(); } + +function end_test() { + cleanupUpdaterTest(); +} diff --git a/toolkit/mozapps/update/test/unit/test_bug595059.js b/toolkit/mozapps/update/test/unit/test_bug595059.js index 772ec1421c77..68ffcfe19224 100644 --- a/toolkit/mozapps/update/test/unit/test_bug595059.js +++ b/toolkit/mozapps/update/test/unit/test_bug595059.js @@ -11,8 +11,8 @@ const TEST_ID = "bug595059"; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); logTestInfo("testing Bug 595059 - calling nsIUpdatePrompt::showUpdateError " + diff --git a/toolkit/mozapps/update/test/unit/test_bug794211.js b/toolkit/mozapps/update/test/unit/test_bug794211.js index d023ec209027..6fa040fd460b 100644 --- a/toolkit/mozapps/update/test/unit/test_bug794211.js +++ b/toolkit/mozapps/update/test/unit/test_bug794211.js @@ -12,8 +12,8 @@ const NETWORK_ERROR_OFFLINE = 111; function run_test() { do_test_pending(); - do_register_cleanup(end_test); + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); logTestInfo("test when an update check fails because the network is " + diff --git a/toolkit/mozapps/update/test/unit/test_bug833708.js b/toolkit/mozapps/update/test/unit/test_bug833708.js index 67116068bedd..4f68c62fb6b7 100644 --- a/toolkit/mozapps/update/test/unit/test_bug833708.js +++ b/toolkit/mozapps/update/test/unit/test_bug833708.js @@ -27,9 +27,9 @@ FakeDirProvider.prototype = { function run_test() { do_test_pending(); - do_register_cleanup(end_test); DEBUG_AUS_TEST = true; + // adjustGeneralPaths registers a cleanup function that calls end_test. adjustGeneralPaths(); removeUpdateDirsAndFiles();