diff --git a/toolkit/modules/FileUtils.jsm b/toolkit/modules/FileUtils.jsm index 0a061af47b2c..f281530bb4b1 100644 --- a/toolkit/modules/FileUtils.jsm +++ b/toolkit/modules/FileUtils.jsm @@ -23,8 +23,8 @@ this.FileUtils = { MODE_APPEND : 0x10, MODE_TRUNCATE : 0x20, - PERMS_FILE : 0644, - PERMS_DIRECTORY : 0755, + PERMS_FILE : 0o644, + PERMS_DIRECTORY : 0o755, /** * Gets a file at the specified hierarchy under a nsIDirectoryService key. diff --git a/toolkit/mozapps/update/tests/chrome/chrome.ini b/toolkit/mozapps/update/tests/chrome/chrome.ini index f6b20996d0f4..e069ba4606fb 100644 --- a/toolkit/mozapps/update/tests/chrome/chrome.ini +++ b/toolkit/mozapps/update/tests/chrome/chrome.ini @@ -64,7 +64,11 @@ reason = Bug 918029 - timeout caused by copying too many files. [test_0097_restartNotification_stagedServiceBackground.xul] [test_0101_background_restartNotification.xul] [test_0102_background_restartNotification_staging.xul] +skip-if = os == 'linux' +reason = Bug 918029 - timeout caused by copying too many files. [test_0103_background_restartNotification_stagingService.xul] +run-if = os == 'win' +reason = only Windows has the maintenance service. [test_0111_neverButton_basic.xul] [test_0112_neverButton_billboard.xul] [test_0113_showNeverForVersionRemovedWithPref.xul] diff --git a/toolkit/mozapps/update/tests/chrome/test_0017_check_staging_basic.xul b/toolkit/mozapps/update/tests/chrome/test_0017_check_staging_basic.xul index 74d3049bf003..ab08cb83f225 100644 --- a/toolkit/mozapps/update/tests/chrome/test_0017_check_staging_basic.xul +++ b/toolkit/mozapps/update/tests/chrome/test_0017_check_staging_basic.xul @@ -39,8 +39,6 @@ function runTest() { let url = URL_HTTP_UPDATE_XML + "?showDetails=1" + getVersionParams(); setUpdateURLOverride(url); - setupTimer(180000); // 180 seconds - gUP.checkForUpdates(); } diff --git a/toolkit/mozapps/update/tests/chrome/test_0102_background_restartNotification_staging.xul b/toolkit/mozapps/update/tests/chrome/test_0102_background_restartNotification_staging.xul index cf4edbdc36c3..25e96a7e2811 100644 --- a/toolkit/mozapps/update/tests/chrome/test_0102_background_restartNotification_staging.xul +++ b/toolkit/mozapps/update/tests/chrome/test_0102_background_restartNotification_staging.xul @@ -33,8 +33,6 @@ function runTest() { let url = URL_HTTP_UPDATE_XML + "?showDetails=1" + getVersionParams(); setUpdateURLOverride(url); - setupTimer(180000); // 180 seconds - gAUS.notify(null); } diff --git a/toolkit/mozapps/update/tests/chrome/test_0103_background_restartNotification_stagingService.xul b/toolkit/mozapps/update/tests/chrome/test_0103_background_restartNotification_stagingService.xul index 11bfcf17673b..fb04ea069d27 100644 --- a/toolkit/mozapps/update/tests/chrome/test_0103_background_restartNotification_stagingService.xul +++ b/toolkit/mozapps/update/tests/chrome/test_0103_background_restartNotification_stagingService.xul @@ -34,8 +34,6 @@ function runTest() { let url = URL_HTTP_UPDATE_XML + "?showDetails=1" + getVersionParams(); setUpdateURLOverride(url); - setupTimer(180000); // 180 seconds - gAUS.notify(null); } diff --git a/toolkit/mozapps/update/tests/chrome/utils.js b/toolkit/mozapps/update/tests/chrome/utils.js index 0f1d39a451bf..553c2754bc62 100644 --- a/toolkit/mozapps/update/tests/chrome/utils.js +++ b/toolkit/mozapps/update/tests/chrome/utils.js @@ -163,7 +163,7 @@ const TEST_ADDONS = [ "appdisabled_1", "appdisabled_2", 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 diff --git a/toolkit/mozapps/update/tests/unit_aus_update/canCheckForAndCanApplyUpdates.js b/toolkit/mozapps/update/tests/unit_aus_update/canCheckForAndCanApplyUpdates.js index e44d4a7674eb..44e07f19535e 100644 --- a/toolkit/mozapps/update/tests/unit_aus_update/canCheckForAndCanApplyUpdates.js +++ b/toolkit/mozapps/update/tests/unit_aus_update/canCheckForAndCanApplyUpdates.js @@ -10,7 +10,7 @@ function run_test() { logTestInfo("testing write access to the application directory"); var testFile = getCurrentProcessDir(); testFile.append("update_write_access_test"); - testFile.create(AUS_Ci.nsIFile.NORMAL_FILE_TYPE, 0644); + testFile.create(AUS_Ci.nsIFile.NORMAL_FILE_TYPE, 0o644); do_check_true(testFile.exists()); testFile.remove(false); do_check_false(testFile.exists()); diff --git a/toolkit/mozapps/update/tests/unit_aus_update/head_update.js b/toolkit/mozapps/update/tests/unit_aus_update/head_update.js index 63ac070ab74d..b3b83f6f4256 100644 --- a/toolkit/mozapps/update/tests/unit_aus_update/head_update.js +++ b/toolkit/mozapps/update/tests/unit_aus_update/head_update.js @@ -2205,7 +2205,7 @@ function symlinkUpdateFilesIntoBundleDirectory() { let dest = getAppDir(); dest.append("active-update.xml"); if (!dest.exists()) { - dest.create(dest.NORMAL_FILE_TYPE, 6 * 64 + 4 * 8 + 4); // 0644 + dest.create(dest.NORMAL_FILE_TYPE, 0o644); } do_check_true(dest.exists()); let source = getUpdatesRootDir(); @@ -2221,7 +2221,7 @@ function symlinkUpdateFilesIntoBundleDirectory() { if (dest2.exists()) { dest2.remove(true); } - dest2.create(dest.DIRECTORY_TYPE, 7 * 64 + 5 * 8 + 5); // 0755 + dest2.create(dest.DIRECTORY_TYPE, 0o755); do_check_true(dest2.exists()); let source2 = getUpdatesRootDir(); source2.append("updates"); @@ -2259,7 +2259,7 @@ function adjustPathsOnWindows() { // running doesn't prevent the updater from moving stuff around. let tmpDir = do_get_profile(); tmpDir.append("ExecutableDir.tmp"); - tmpDir.createUnique(tmpDir.DIRECTORY_TYPE, 7 * 64 + 5 * 8 + 5); // 0755 + tmpDir.createUnique(tmpDir.DIRECTORY_TYPE, 0o755); let procDir = getCurrentProcessDir(); logTestInfo("start - copy the process directory"); copyMinimumAppFiles(procDir, tmpDir, "bin"); diff --git a/toolkit/mozapps/update/tests/unit_base_updater/marAppInUseStageSuccessComplete_unix.js b/toolkit/mozapps/update/tests/unit_base_updater/marAppInUseStageSuccessComplete_unix.js index 567710dbc424..1e5581bd9789 100644 --- a/toolkit/mozapps/update/tests/unit_base_updater/marAppInUseStageSuccessComplete_unix.js +++ b/toolkit/mozapps/update/tests/unit_base_updater/marAppInUseStageSuccessComplete_unix.js @@ -16,8 +16,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0767, - comparePerms : 0767 + originalPerms : 0o767, + comparePerms : 0o767 }, { description : "Added by update.manifest (add)", fileName : "precomplete", @@ -26,8 +26,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial_precomplete", compareFile : "complete_precomplete", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -36,8 +36,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginspng1.png", @@ -47,7 +47,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginspng0.png", @@ -56,8 +56,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "removed-files", @@ -66,8 +66,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial_removed-files", compareFile : "complete_removed-files", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -78,7 +78,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -88,8 +88,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -100,7 +100,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -111,7 +111,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -122,7 +122,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -133,7 +133,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "exe0.exe", @@ -142,8 +142,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0777, - comparePerms : 0755 + originalPerms : 0o777, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "10text0", @@ -152,8 +152,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0767, - comparePerms : 0644 + originalPerms : 0o767, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "0exe0.exe", @@ -162,8 +162,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0777, - comparePerms : 0755 + originalPerms : 0o777, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "00text1", @@ -172,8 +172,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0677, - comparePerms : 0644 + originalPerms : 0o677, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -182,8 +182,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00png0.png", @@ -192,8 +192,8 @@ const TEST_FILES = [ compareContents : null, originalFile : null, compareFile : "complete.png", - originalPerms : 0776, - comparePerms : 0644 + originalPerms : 0o776, + comparePerms : 0o644 }, { description : "Removed by precomplete (remove)", fileName : "20text0", diff --git a/toolkit/mozapps/update/tests/unit_base_updater/marAppInUseSuccessComplete.js b/toolkit/mozapps/update/tests/unit_base_updater/marAppInUseSuccessComplete.js index 6d17edaf8ede..6a00fb7fa066 100644 --- a/toolkit/mozapps/update/tests/unit_base_updater/marAppInUseSuccessComplete.js +++ b/toolkit/mozapps/update/tests/unit_base_updater/marAppInUseSuccessComplete.js @@ -16,8 +16,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0767, - comparePerms : 0767 + originalPerms : 0o767, + comparePerms : 0o767 }, { description : "Added by update.manifest (add)", fileName : "precomplete", @@ -26,8 +26,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial_precomplete", compareFile : "complete_precomplete", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -36,8 +36,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginspng1.png", @@ -47,7 +47,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginspng0.png", @@ -56,8 +56,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "removed-files", @@ -66,8 +66,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial_removed-files", compareFile : "complete_removed-files", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -78,7 +78,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -88,8 +88,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -100,7 +100,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -111,7 +111,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -122,7 +122,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -133,7 +133,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "exe0.exe", @@ -142,8 +142,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0777, - comparePerms : 0755 + originalPerms : 0o777, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "10text0", @@ -152,8 +152,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0767, - comparePerms : 0644 + originalPerms : 0o767, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "0exe0.exe", @@ -162,8 +162,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0777, - comparePerms : 0755 + originalPerms : 0o777, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "00text1", @@ -172,8 +172,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0677, - comparePerms : 0644 + originalPerms : 0o677, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -182,8 +182,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00png0.png", @@ -192,8 +192,8 @@ const TEST_FILES = [ compareContents : null, originalFile : null, compareFile : "complete.png", - originalPerms : 0776, - comparePerms : 0644 + originalPerms : 0o776, + comparePerms : 0o644 }, { description : "Removed by precomplete (remove)", fileName : "20text0", diff --git a/toolkit/mozapps/update/tests/unit_base_updater/marFailurePartial.js b/toolkit/mozapps/update/tests/unit_base_updater/marFailurePartial.js index b9334ae128d4..222a2f71798b 100644 --- a/toolkit/mozapps/update/tests/unit_base_updater/marFailurePartial.js +++ b/toolkit/mozapps/update/tests/unit_base_updater/marFailurePartial.js @@ -17,7 +17,7 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0767, + originalPerms : 0o767, comparePerms : null }, { description : "Not added for failed update (add)", @@ -27,8 +27,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete_precomplete", compareFile : "complete_precomplete", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not added for failed update (add)", fileName : "searchpluginstext0", @@ -37,8 +37,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0775 + originalPerms : 0o775, + comparePerms : 0o775 }, { description : "Not patched for failed update (patch-if)", fileName : "searchpluginspng1.png", @@ -47,8 +47,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not patched for failed update (patch-if)", fileName : "searchpluginspng0.png", @@ -57,8 +57,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not added for failed update (add-if)", fileName : "extensions1text0", @@ -77,8 +77,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not patched for failed update (patch-if)", fileName : "extensions1png0.png", @@ -87,8 +87,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not added for failed update (add-if)", fileName : "extensions0text0", @@ -97,8 +97,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Not patched for failed update (patch-if)", fileName : "extensions0png1.png", @@ -107,8 +107,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Not patched for failed update (patch-if)", fileName : "extensions0png0.png", @@ -117,8 +117,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Not patched for failed update (patch)", fileName : "exe0.exe", @@ -127,8 +127,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0755, - comparePerms : 0755 + originalPerms : 0o755, + comparePerms : 0o755 }, { description : "Not patched for failed update (patch) and causes " + "LoadSourceFile failed", @@ -138,8 +138,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "partial.png", - originalPerms : 0755, - comparePerms : 0755 + originalPerms : 0o755, + comparePerms : 0o755 }, { description : "Not added for failed update (add)", fileName : "00text0", @@ -158,8 +158,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not added for failed update (add)", fileName : "20text0", @@ -198,8 +198,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeDeleted\n", originalFile : null, compareFile : null, - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not removed for failed update (remove)", fileName : "00text1", @@ -208,8 +208,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeDeleted\n", originalFile : null, compareFile : null, - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }]; ADDITIONAL_TEST_DIRS = [ diff --git a/toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseFallbackStageFailurePartial_win.js b/toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseFallbackStageFailurePartial_win.js index d225d008772d..1130a2543ee3 100644 --- a/toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseFallbackStageFailurePartial_win.js +++ b/toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseFallbackStageFailurePartial_win.js @@ -15,9 +15,7 @@ const TEST_FILES = [ originalContents : "ShouldNotBeReplaced\n", compareContents : "ShouldNotBeReplaced\n", originalFile : null, - compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + compareFile : null }, { description : "Added by update.manifest (add)", fileName : "precomplete", @@ -25,9 +23,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete_precomplete", - compareFile : "complete_precomplete", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete_precomplete" }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -35,9 +31,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "ToBeReplacedWithFromPartial\n", originalFile : null, - compareFile : null, - originalPerms : 0775, - comparePerms : 0775 + compareFile : null }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -46,9 +40,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -57,9 +49,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -68,9 +58,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -79,9 +67,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -90,9 +76,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -101,9 +85,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "ToBeReplacedWithFromPartial\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -112,9 +94,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : null, - comparePerms : null + compareFile : "complete.png" }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -123,9 +103,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : null, - comparePerms : null + compareFile : "complete.png" }, { description : "Patched by update.manifest (patch)", fileName : "exe0.exe", @@ -133,9 +111,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0755, - comparePerms : 0755 + compareFile : "complete.png" }, { description : "Patched by update.manifest (patch)", fileName : "0exe0.exe", @@ -143,9 +119,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0755, - comparePerms : 0755 + compareFile : "complete.png" }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -153,9 +127,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "ToBeReplacedWithFromPartial\n", originalFile : null, - compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + compareFile : null }, { description : "Patched by update.manifest (patch)", fileName : "00png0.png", @@ -163,9 +135,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Added by update.manifest (add)", fileName : "20text0", @@ -173,9 +143,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Added by update.manifest (add)", fileName : "20png0.png", @@ -183,9 +151,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Added by update.manifest (add)", fileName : "00text2", @@ -193,9 +159,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Removed by update.manifest (remove)", fileName : "10text0", @@ -203,9 +167,7 @@ const TEST_FILES = [ originalContents : "ToBeDeleted\n", compareContents : "ToBeDeleted\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Removed by update.manifest (remove)", fileName : "00text1", @@ -213,9 +175,7 @@ const TEST_FILES = [ originalContents : "ToBeDeleted\n", compareContents : "ToBeDeleted\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }]; ADDITIONAL_TEST_DIRS = [ diff --git a/toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageSuccessPartial_win.js b/toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageSuccessPartial_win.js index 1a3ef47b70ca..7f561d99c570 100644 --- a/toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageSuccessPartial_win.js +++ b/toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageSuccessPartial_win.js @@ -15,9 +15,7 @@ const TEST_FILES = [ originalContents : "ShouldNotBeReplaced\n", compareContents : "ShouldNotBeReplaced\n", originalFile : null, - compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + compareFile : null }, { description : "Added by update.manifest (add)", fileName : "precomplete", @@ -25,9 +23,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete_precomplete", - compareFile : "complete_precomplete", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete_precomplete" }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -35,9 +31,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "ToBeReplacedWithFromPartial\n", originalFile : null, - compareFile : null, - originalPerms : 0775, - comparePerms : 0775 + compareFile : null }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -46,9 +40,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -57,9 +49,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -68,9 +58,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -79,9 +67,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -90,9 +76,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -101,9 +85,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "ToBeReplacedWithFromPartial\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -112,9 +94,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : null, - comparePerms : null + compareFile : "complete.png" }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -123,9 +103,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : null, - comparePerms : null + compareFile : "complete.png" }, { description : "Patched by update.manifest (patch)", fileName : "exe0.exe", @@ -133,9 +111,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0755, - comparePerms : 0755 + compareFile : "complete.png" }, { description : "Patched by update.manifest (patch)", fileName : "0exe0.exe", @@ -143,9 +119,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0755, - comparePerms : 0755 + compareFile : "complete.png" }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -153,9 +127,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "ToBeReplacedWithFromPartial\n", originalFile : null, - compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + compareFile : null }, { description : "Patched by update.manifest (patch)", fileName : "00png0.png", @@ -163,9 +135,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Added by update.manifest (add)", fileName : "20text0", @@ -173,9 +143,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Added by update.manifest (add)", fileName : "20png0.png", @@ -183,9 +151,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Added by update.manifest (add)", fileName : "00text2", @@ -193,9 +159,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Removed by update.manifest (remove)", fileName : "10text0", @@ -203,9 +167,7 @@ const TEST_FILES = [ originalContents : "ToBeDeleted\n", compareContents : "ToBeDeleted\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Removed by update.manifest (remove)", fileName : "00text1", @@ -213,9 +175,7 @@ const TEST_FILES = [ originalContents : "ToBeDeleted\n", compareContents : "ToBeDeleted\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }]; ADDITIONAL_TEST_DIRS = [ diff --git a/toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseSuccessPartial_win.js b/toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseSuccessPartial_win.js index 73a4c8ea4986..83842b32c50b 100644 --- a/toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseSuccessPartial_win.js +++ b/toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseSuccessPartial_win.js @@ -15,9 +15,7 @@ const TEST_FILES = [ originalContents : "ShouldNotBeReplaced\n", compareContents : "ShouldNotBeReplaced\n", originalFile : null, - compareFile : null, - originalPerms : 0644, - comparePerms : null + compareFile : null }, { description : "Added by update.manifest (add)", fileName : "precomplete", @@ -25,9 +23,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete_precomplete", - compareFile : "partial_precomplete", - originalPerms : 0666, - comparePerms : 0644 + compareFile : "partial_precomplete" }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -35,9 +31,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "FromPartial\n", originalFile : null, - compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + compareFile : null }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -46,9 +40,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "partial.png" }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -57,9 +49,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "partial.png" }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -68,9 +58,7 @@ const TEST_FILES = [ originalContents : null, compareContents : "FromPartial\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : 0644 + compareFile : null }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -79,9 +67,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "partial.png" }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -90,9 +76,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "partial.png" }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -101,9 +85,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "FromPartial\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : 0644 + compareFile : null }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -112,9 +94,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : null, - comparePerms : 0644 + compareFile : "partial.png" }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -123,9 +103,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : null, - comparePerms : 0644 + compareFile : "partial.png" }, { description : "Patched by update.manifest (patch)", fileName : "exe0.exe", @@ -133,9 +111,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : 0755, - comparePerms : null + compareFile : "partial.png" }, { description : "Patched by update.manifest (patch)", fileName : "0exe0.exe", @@ -143,9 +119,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : 0755, - comparePerms : null + compareFile : "partial.png" }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -153,9 +127,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "FromPartial\n", originalFile : null, - compareFile : null, - originalPerms : 0644, - comparePerms : null + compareFile : null }, { description : "Patched by update.manifest (patch)", fileName : "00png0.png", @@ -163,9 +135,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "partial.png" }, { description : "Added by update.manifest (add)", fileName : "20text0", @@ -173,9 +143,7 @@ const TEST_FILES = [ originalContents : null, compareContents : "FromPartial\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : 0644 + compareFile : null }, { description : "Added by update.manifest (add)", fileName : "20png0.png", @@ -183,9 +151,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : "partial.png", - originalPerms : null, - comparePerms : 0644 + compareFile : "partial.png" }, { description : "Added by update.manifest (add)", fileName : "00text2", @@ -193,9 +159,7 @@ const TEST_FILES = [ originalContents : null, compareContents : "FromPartial\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : 0644 + compareFile : null }, { description : "Removed by update.manifest (remove)", fileName : "10text0", @@ -203,9 +167,7 @@ const TEST_FILES = [ originalContents : "ToBeDeleted\n", compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Removed by update.manifest (remove)", fileName : "00text1", @@ -213,9 +175,7 @@ const TEST_FILES = [ originalContents : "ToBeDeleted\n", compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }]; ADDITIONAL_TEST_DIRS = [ diff --git a/toolkit/mozapps/update/tests/unit_base_updater/marStageFailurePartial.js b/toolkit/mozapps/update/tests/unit_base_updater/marStageFailurePartial.js index 6f8751b4189b..73ab03252d34 100644 --- a/toolkit/mozapps/update/tests/unit_base_updater/marStageFailurePartial.js +++ b/toolkit/mozapps/update/tests/unit_base_updater/marStageFailurePartial.js @@ -17,7 +17,7 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0767, + originalPerms : 0o767, comparePerms : null }, { description : "Not added for failed update (add)", @@ -27,8 +27,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete_precomplete", compareFile : "complete_precomplete", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not added for failed update (add)", fileName : "searchpluginstext0", @@ -37,8 +37,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0775 + originalPerms : 0o775, + comparePerms : 0o775 }, { description : "Not patched for failed update (patch-if)", fileName : "searchpluginspng1.png", @@ -47,8 +47,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not patched for failed update (patch-if)", fileName : "searchpluginspng0.png", @@ -57,8 +57,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not added for failed update (add-if)", fileName : "extensions1text0", @@ -77,8 +77,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not patched for failed update (patch-if)", fileName : "extensions1png0.png", @@ -87,8 +87,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not added for failed update (add-if)", fileName : "extensions0text0", @@ -97,8 +97,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Not patched for failed update (patch-if)", fileName : "extensions0png1.png", @@ -107,8 +107,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Not patched for failed update (patch-if)", fileName : "extensions0png0.png", @@ -117,8 +117,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Not patched for failed update (patch)", fileName : "exe0.exe", @@ -127,8 +127,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0755, - comparePerms : 0755 + originalPerms : 0o755, + comparePerms : 0o755 }, { description : "Not patched for failed update (patch) and causes " + "LoadSourceFile failed", @@ -138,8 +138,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "partial.png", - originalPerms : 0755, - comparePerms : 0755 + originalPerms : 0o755, + comparePerms : 0o755 }, { description : "Not added for failed update (add)", fileName : "00text0", @@ -158,8 +158,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not added for failed update (add)", fileName : "20text0", @@ -198,8 +198,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeDeleted\n", originalFile : null, compareFile : null, - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not removed for failed update (remove)", fileName : "00text1", @@ -208,8 +208,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeDeleted\n", originalFile : null, compareFile : null, - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }]; ADDITIONAL_TEST_DIRS = [ diff --git a/toolkit/mozapps/update/tests/unit_base_updater/marStageSuccessComplete.js b/toolkit/mozapps/update/tests/unit_base_updater/marStageSuccessComplete.js index 92172e7ddf50..55f5ce5b979f 100644 --- a/toolkit/mozapps/update/tests/unit_base_updater/marStageSuccessComplete.js +++ b/toolkit/mozapps/update/tests/unit_base_updater/marStageSuccessComplete.js @@ -17,8 +17,8 @@ var TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 7 * 64 + 6 * 8 + 7, // 0767 - comparePerms : 7 * 64 + 6 * 8 + 7 // 0767 + originalPerms : 0o767, + comparePerms : 0o767 }, { description : "Added by update.manifest (add)", fileName : "precomplete", @@ -27,8 +27,8 @@ var TEST_FILES = [ compareContents : null, originalFile : "partial_precomplete", compareFile : "complete_precomplete", - originalPerms : 6 * 64 + 6 * 8 + 6, // 0666 - comparePerms : 6 * 64 + 4 * 8 + 4 // 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -37,8 +37,8 @@ var TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 7 * 64 + 7 * 8 + 5, // 0775 - comparePerms : 6 * 64 + 4 * 8 + 4 // 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginspng1.png", @@ -48,7 +48,7 @@ var TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 6 * 64 + 4 * 8 + 4 // 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginspng0.png", @@ -57,8 +57,8 @@ var TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 6 * 64 + 6 * 8 + 6, // 0666 - comparePerms : 6 * 64 + 4 * 8 + 4 // 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "removed-files", @@ -67,8 +67,8 @@ var TEST_FILES = [ compareContents : null, originalFile : "partial_removed-files", compareFile : "complete_removed-files", - originalPerms : 6 * 64 + 6 * 8 + 6, // 0666 - comparePerms : 6 * 64 + 4 * 8 + 4 // 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -79,7 +79,7 @@ var TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 6 * 64 + 4 * 8 + 4 // 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -89,8 +89,8 @@ var TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 6 * 64 + 6 * 8 + 6, // 0666 - comparePerms : 6 * 64 + 4 * 8 + 4 // 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -101,7 +101,7 @@ var TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 6 * 64 + 4 * 8 + 4 // 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -112,7 +112,7 @@ var TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 6 * 64 + 4 * 8 + 4 // 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -123,7 +123,7 @@ var TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 6 * 64 + 4 * 8 + 4 // 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -134,7 +134,7 @@ var TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 6 * 64 + 4 * 8 + 4 // 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "exe0.exe", @@ -143,8 +143,8 @@ var TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 7 * 64 + 7 * 8 + 7, // 0777 - comparePerms : 7 * 64 + 5 * 8 + 5 // 0755 + originalPerms : 0o777, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "10text0", @@ -153,8 +153,8 @@ var TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 7 * 64 + 6 * 8 + 7, // 0767 - comparePerms : 6 * 64 + 4 * 8 + 4 // 0644 + originalPerms : 0o767, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "0exe0.exe", @@ -163,8 +163,8 @@ var TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 7 * 64 + 7 * 8 + 7, // 0777 - comparePerms : 7 * 64 + 5 * 8 + 5 // 0755 + originalPerms : 0o777, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "00text1", @@ -173,8 +173,8 @@ var TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 6 * 64 + 7 * 8 + 7, // 0677 - comparePerms : 6 * 64 + 4 * 8 + 4 // 0644 + originalPerms : 0o677, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -183,8 +183,8 @@ var TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 7 * 64 + 7 * 8 + 5, // 0775 - comparePerms : 6 * 64 + 4 * 8 + 4 // 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00png0.png", @@ -193,8 +193,8 @@ var TEST_FILES = [ compareContents : null, originalFile : null, compareFile : "complete.png", - originalPerms : 7 * 64 + 7 * 8 + 6, // 0776 - comparePerms : 6 * 64 + 4 * 8 + 4 // 0644 + originalPerms : 0o776, + comparePerms : 0o644 }, { description : "Removed by precomplete (remove)", fileName : "20text0", @@ -291,8 +291,8 @@ function run_test() { compareContents : "test", originalFile : null, compareFile : null, - originalPerms : 6 * 64 + 6 * 8 + 4, // 0664 - comparePerms : 6 * 64 + 6 * 8 + 4 // 0664 + originalPerms : 0o664, + comparePerms : 0o664 }); } diff --git a/toolkit/mozapps/update/tests/unit_base_updater/marStageSuccessPartial.js b/toolkit/mozapps/update/tests/unit_base_updater/marStageSuccessPartial.js index 4e965dae8205..3cb0ce174ee4 100644 --- a/toolkit/mozapps/update/tests/unit_base_updater/marStageSuccessPartial.js +++ b/toolkit/mozapps/update/tests/unit_base_updater/marStageSuccessPartial.js @@ -17,7 +17,7 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0644, + originalPerms : 0o644, comparePerms : null }, { description : "Added by update.manifest (add)", @@ -27,8 +27,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete_precomplete", compareFile : "partial_precomplete", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -37,8 +37,8 @@ const TEST_FILES = [ compareContents : "FromPartial\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -48,8 +48,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -59,8 +59,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -71,7 +71,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -81,8 +81,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -92,8 +92,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -103,8 +103,8 @@ const TEST_FILES = [ compareContents : "FromPartial\n", originalFile : null, compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -114,8 +114,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -125,8 +125,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Patched by update.manifest (patch)", fileName : "exe0.exe", @@ -135,8 +135,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0755, - comparePerms : 0755 + originalPerms : 0o755, + comparePerms : 0o755 }, { description : "Patched by update.manifest (patch)", fileName : "0exe0.exe", @@ -145,8 +145,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0755, - comparePerms : 0755 + originalPerms : 0o755, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -155,8 +155,8 @@ const TEST_FILES = [ compareContents : "FromPartial\n", originalFile : null, compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Patched by update.manifest (patch)", fileName : "00png0.png", @@ -165,8 +165,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Added by update.manifest (add)", fileName : "20text0", @@ -176,7 +176,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "20png0.png", @@ -186,7 +186,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "partial.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00text2", @@ -196,7 +196,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Removed by update.manifest (remove)", fileName : "10text0", diff --git a/toolkit/mozapps/update/tests/unit_base_updater/marSuccessComplete.js b/toolkit/mozapps/update/tests/unit_base_updater/marSuccessComplete.js index 78fc94334cab..15652d9f4c52 100644 --- a/toolkit/mozapps/update/tests/unit_base_updater/marSuccessComplete.js +++ b/toolkit/mozapps/update/tests/unit_base_updater/marSuccessComplete.js @@ -17,8 +17,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0767, - comparePerms : 0767 + originalPerms : 0o767, + comparePerms : 0o767 }, { description : "Added by update.manifest (add)", fileName : "precomplete", @@ -27,8 +27,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial_precomplete", compareFile : "complete_precomplete", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -37,8 +37,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginspng1.png", @@ -48,7 +48,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginspng0.png", @@ -57,8 +57,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "removed-files", @@ -67,8 +67,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial_removed-files", compareFile : "complete_removed-files", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -79,7 +79,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -89,8 +89,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -101,7 +101,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -112,7 +112,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -123,7 +123,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -134,7 +134,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "exe0.exe", @@ -143,8 +143,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0777, - comparePerms : 0755 + originalPerms : 0o777, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "10text0", @@ -153,8 +153,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0767, - comparePerms : 0644 + originalPerms : 0o767, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "0exe0.exe", @@ -163,8 +163,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0777, - comparePerms : 0755 + originalPerms : 0o777, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "00text1", @@ -173,8 +173,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0677, - comparePerms : 0644 + originalPerms : 0o677, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -183,8 +183,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00png0.png", @@ -193,8 +193,8 @@ const TEST_FILES = [ compareContents : null, originalFile : null, compareFile : "complete.png", - originalPerms : 0776, - comparePerms : 0644 + originalPerms : 0o776, + comparePerms : 0o644 }, { description : "Removed by precomplete (remove)", fileName : "20text0", diff --git a/toolkit/mozapps/update/tests/unit_base_updater/marSuccessPartial.js b/toolkit/mozapps/update/tests/unit_base_updater/marSuccessPartial.js index d1402e1936f4..0ffd089abf98 100644 --- a/toolkit/mozapps/update/tests/unit_base_updater/marSuccessPartial.js +++ b/toolkit/mozapps/update/tests/unit_base_updater/marSuccessPartial.js @@ -17,7 +17,7 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0644, + originalPerms : 0o644, comparePerms : null }, { description : "Added by update.manifest (add)", @@ -27,8 +27,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete_precomplete", compareFile : "partial_precomplete", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -37,8 +37,8 @@ const TEST_FILES = [ compareContents : "FromPartial\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -48,8 +48,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -59,8 +59,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -71,7 +71,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -81,8 +81,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -92,8 +92,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -103,8 +103,8 @@ const TEST_FILES = [ compareContents : "FromPartial\n", originalFile : null, compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -114,8 +114,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -125,8 +125,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Patched by update.manifest (patch)", fileName : "exe0.exe", @@ -135,8 +135,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0755, - comparePerms : 0755 + originalPerms : 0o755, + comparePerms : 0o755 }, { description : "Patched by update.manifest (patch)", fileName : "0exe0.exe", @@ -145,8 +145,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0755, - comparePerms : 0755 + originalPerms : 0o755, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -155,8 +155,8 @@ const TEST_FILES = [ compareContents : "FromPartial\n", originalFile : null, compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Patched by update.manifest (patch)", fileName : "00png0.png", @@ -165,8 +165,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Added by update.manifest (add)", fileName : "20text0", @@ -176,7 +176,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "20png0.png", @@ -186,7 +186,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "partial.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00text2", @@ -196,7 +196,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Removed by update.manifest (remove)", fileName : "10text0", diff --git a/toolkit/mozapps/update/tests/unit_service_updater/marAppInUseSuccessCompleteSvc.js b/toolkit/mozapps/update/tests/unit_service_updater/marAppInUseSuccessCompleteSvc.js index 9fba5c2f4c7f..cbf8d26b4396 100644 --- a/toolkit/mozapps/update/tests/unit_service_updater/marAppInUseSuccessCompleteSvc.js +++ b/toolkit/mozapps/update/tests/unit_service_updater/marAppInUseSuccessCompleteSvc.js @@ -16,8 +16,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0767, - comparePerms : 0767 + originalPerms : 0o767, + comparePerms : 0o767 }, { description : "Added by update.manifest (add)", fileName : "precomplete", @@ -26,8 +26,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial_precomplete", compareFile : "complete_precomplete", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -36,8 +36,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginspng1.png", @@ -47,7 +47,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginspng0.png", @@ -56,8 +56,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "removed-files", @@ -66,8 +66,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial_removed-files", compareFile : "complete_removed-files", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -78,7 +78,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -88,8 +88,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -100,7 +100,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -111,7 +111,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -122,7 +122,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -133,7 +133,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "exe0.exe", @@ -142,8 +142,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0777, - comparePerms : 0755 + originalPerms : 0o777, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "10text0", @@ -152,8 +152,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0767, - comparePerms : 0644 + originalPerms : 0o767, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "0exe0.exe", @@ -162,8 +162,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0777, - comparePerms : 0755 + originalPerms : 0o777, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "00text1", @@ -172,8 +172,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0677, - comparePerms : 0644 + originalPerms : 0o677, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -182,8 +182,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00png0.png", @@ -192,8 +192,8 @@ const TEST_FILES = [ compareContents : null, originalFile : null, compareFile : "complete.png", - originalPerms : 0776, - comparePerms : 0644 + originalPerms : 0o776, + comparePerms : 0o644 }, { description : "Removed by precomplete (remove)", fileName : "20text0", diff --git a/toolkit/mozapps/update/tests/unit_service_updater/marFailurePartialSvc.js b/toolkit/mozapps/update/tests/unit_service_updater/marFailurePartialSvc.js index 07ff2fc73564..3d65f88efd60 100644 --- a/toolkit/mozapps/update/tests/unit_service_updater/marFailurePartialSvc.js +++ b/toolkit/mozapps/update/tests/unit_service_updater/marFailurePartialSvc.js @@ -17,7 +17,7 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0767, + originalPerms : 0o767, comparePerms : null }, { description : "Not added for failed update (add)", @@ -27,8 +27,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete_precomplete", compareFile : "complete_precomplete", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not added for failed update (add)", fileName : "searchpluginstext0", @@ -37,8 +37,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0775 + originalPerms : 0o775, + comparePerms : 0o775 }, { description : "Not patched for failed update (patch-if)", fileName : "searchpluginspng1.png", @@ -47,8 +47,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not patched for failed update (patch-if)", fileName : "searchpluginspng0.png", @@ -57,8 +57,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not added for failed update (add-if)", fileName : "extensions1text0", @@ -77,8 +77,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not patched for failed update (patch-if)", fileName : "extensions1png0.png", @@ -87,8 +87,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not added for failed update (add-if)", fileName : "extensions0text0", @@ -97,8 +97,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Not patched for failed update (patch-if)", fileName : "extensions0png1.png", @@ -107,8 +107,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Not patched for failed update (patch-if)", fileName : "extensions0png0.png", @@ -117,8 +117,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Not patched for failed update (patch)", fileName : "exe0.exe", @@ -127,8 +127,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0755, - comparePerms : 0755 + originalPerms : 0o755, + comparePerms : 0o755 }, { description : "Not patched for failed update (patch) and causes " + "LoadSourceFile failed", @@ -138,8 +138,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "partial.png", - originalPerms : 0755, - comparePerms : 0755 + originalPerms : 0o755, + comparePerms : 0o755 }, { description : "Not added for failed update (add)", fileName : "00text0", @@ -158,8 +158,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not added for failed update (add)", fileName : "20text0", @@ -198,8 +198,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeDeleted\n", originalFile : null, compareFile : null, - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not removed for failed update (remove)", fileName : "00text1", @@ -208,8 +208,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeDeleted\n", originalFile : null, compareFile : null, - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }]; ADDITIONAL_TEST_DIRS = [ diff --git a/toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseFallbackStageFailurePartialSvc_win.js b/toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseFallbackStageFailurePartialSvc_win.js index 54a8b61a194d..a22b8b516c47 100644 --- a/toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseFallbackStageFailurePartialSvc_win.js +++ b/toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseFallbackStageFailurePartialSvc_win.js @@ -15,9 +15,7 @@ const TEST_FILES = [ originalContents : "ShouldNotBeReplaced\n", compareContents : "ShouldNotBeReplaced\n", originalFile : null, - compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + compareFile : null }, { description : "Added by update.manifest (add)", fileName : "precomplete", @@ -25,9 +23,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete_precomplete", - compareFile : "complete_precomplete", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete_precomplete" }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -35,9 +31,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "ToBeReplacedWithFromPartial\n", originalFile : null, - compareFile : null, - originalPerms : 0775, - comparePerms : 0775 + compareFile : null }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -46,9 +40,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -57,9 +49,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -68,9 +58,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -79,9 +67,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -90,9 +76,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -101,9 +85,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "ToBeReplacedWithFromPartial\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -112,9 +94,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : null, - comparePerms : null + compareFile : "complete.png" }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -123,9 +103,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : null, - comparePerms : null + compareFile : "complete.png" }, { description : "Patched by update.manifest (patch)", fileName : "exe0.exe", @@ -133,9 +111,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0755, - comparePerms : 0755 + compareFile : "complete.png" }, { description : "Patched by update.manifest (patch)", fileName : "0exe0.exe", @@ -143,9 +119,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0755, - comparePerms : 0755 + compareFile : "complete.png" }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -153,9 +127,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "ToBeReplacedWithFromPartial\n", originalFile : null, - compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + compareFile : null }, { description : "Patched by update.manifest (patch)", fileName : "00png0.png", @@ -163,9 +135,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Added by update.manifest (add)", fileName : "20text0", @@ -173,9 +143,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Added by update.manifest (add)", fileName : "20png0.png", @@ -183,9 +151,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Added by update.manifest (add)", fileName : "00text2", @@ -193,9 +159,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Removed by update.manifest (remove)", fileName : "10text0", @@ -203,9 +167,7 @@ const TEST_FILES = [ originalContents : "ToBeDeleted\n", compareContents : "ToBeDeleted\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Removed by update.manifest (remove)", fileName : "00text1", @@ -213,9 +175,7 @@ const TEST_FILES = [ originalContents : "ToBeDeleted\n", compareContents : "ToBeDeleted\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }]; ADDITIONAL_TEST_DIRS = [ diff --git a/toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageSuccessPartialSvc_win.js b/toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageSuccessPartialSvc_win.js index fd46bf6c4ba3..e3e479c7cdc5 100644 --- a/toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageSuccessPartialSvc_win.js +++ b/toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageSuccessPartialSvc_win.js @@ -15,9 +15,7 @@ const TEST_FILES = [ originalContents : "ShouldNotBeReplaced\n", compareContents : "ShouldNotBeReplaced\n", originalFile : null, - compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + compareFile : null }, { description : "Added by update.manifest (add)", fileName : "precomplete", @@ -25,9 +23,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete_precomplete", - compareFile : "complete_precomplete", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete_precomplete" }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -35,9 +31,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "ToBeReplacedWithFromPartial\n", originalFile : null, - compareFile : null, - originalPerms : 0775, - comparePerms : 0775 + compareFile : null }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -46,9 +40,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -57,9 +49,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -68,9 +58,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -79,9 +67,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -90,9 +76,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -101,9 +85,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "ToBeReplacedWithFromPartial\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -112,9 +94,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : null, - comparePerms : null + compareFile : "complete.png" }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -123,9 +103,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : null, - comparePerms : null + compareFile : "complete.png" }, { description : "Patched by update.manifest (patch)", fileName : "exe0.exe", @@ -133,9 +111,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0755, - comparePerms : 0755 + compareFile : "complete.png" }, { description : "Patched by update.manifest (patch)", fileName : "0exe0.exe", @@ -143,9 +119,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0755, - comparePerms : 0755 + compareFile : "complete.png" }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -153,9 +127,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "ToBeReplacedWithFromPartial\n", originalFile : null, - compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + compareFile : null }, { description : "Patched by update.manifest (patch)", fileName : "00png0.png", @@ -163,9 +135,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "complete.png" }, { description : "Added by update.manifest (add)", fileName : "20text0", @@ -173,9 +143,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Added by update.manifest (add)", fileName : "20png0.png", @@ -183,9 +151,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Added by update.manifest (add)", fileName : "00text2", @@ -193,9 +159,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Removed by update.manifest (remove)", fileName : "10text0", @@ -203,9 +167,7 @@ const TEST_FILES = [ originalContents : "ToBeDeleted\n", compareContents : "ToBeDeleted\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Removed by update.manifest (remove)", fileName : "00text1", @@ -213,9 +175,7 @@ const TEST_FILES = [ originalContents : "ToBeDeleted\n", compareContents : "ToBeDeleted\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }]; ADDITIONAL_TEST_DIRS = [ diff --git a/toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseSuccessPartialSvc_win.js b/toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseSuccessPartialSvc_win.js index bf836f38484b..f1372ca75a06 100644 --- a/toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseSuccessPartialSvc_win.js +++ b/toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseSuccessPartialSvc_win.js @@ -15,9 +15,7 @@ const TEST_FILES = [ originalContents : "ShouldNotBeReplaced\n", compareContents : "ShouldNotBeReplaced\n", originalFile : null, - compareFile : null, - originalPerms : 0644, - comparePerms : null + compareFile : null }, { description : "Added by update.manifest (add)", fileName : "precomplete", @@ -25,9 +23,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete_precomplete", - compareFile : "partial_precomplete", - originalPerms : 0666, - comparePerms : 0644 + compareFile : "partial_precomplete" }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -35,9 +31,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "FromPartial\n", originalFile : null, - compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + compareFile : null }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -46,9 +40,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "partial.png" }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -57,9 +49,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "partial.png" }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -68,9 +58,7 @@ const TEST_FILES = [ originalContents : null, compareContents : "FromPartial\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : 0644 + compareFile : null }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -79,9 +67,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "partial.png" }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -90,9 +76,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "partial.png" }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -101,9 +85,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "FromPartial\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : 0644 + compareFile : null }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -112,9 +94,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : null, - comparePerms : 0644 + compareFile : "partial.png" }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -123,9 +103,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : null, - comparePerms : 0644 + compareFile : "partial.png" }, { description : "Patched by update.manifest (patch)", fileName : "exe0.exe", @@ -133,9 +111,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : 0755, - comparePerms : null + compareFile : "partial.png" }, { description : "Patched by update.manifest (patch)", fileName : "0exe0.exe", @@ -143,9 +119,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : 0755, - comparePerms : null + compareFile : "partial.png" }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -153,9 +127,7 @@ const TEST_FILES = [ originalContents : "ToBeReplacedWithFromPartial\n", compareContents : "FromPartial\n", originalFile : null, - compareFile : null, - originalPerms : 0644, - comparePerms : null + compareFile : null }, { description : "Patched by update.manifest (patch)", fileName : "00png0.png", @@ -163,9 +135,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : "complete.png", - compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + compareFile : "partial.png" }, { description : "Added by update.manifest (add)", fileName : "20text0", @@ -173,9 +143,7 @@ const TEST_FILES = [ originalContents : null, compareContents : "FromPartial\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : 0644 + compareFile : null }, { description : "Added by update.manifest (add)", fileName : "20png0.png", @@ -183,9 +151,7 @@ const TEST_FILES = [ originalContents : null, compareContents : null, originalFile : null, - compareFile : "partial.png", - originalPerms : null, - comparePerms : 0644 + compareFile : "partial.png" }, { description : "Added by update.manifest (add)", fileName : "00text2", @@ -193,9 +159,7 @@ const TEST_FILES = [ originalContents : null, compareContents : "FromPartial\n", originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : 0644 + compareFile : null }, { description : "Removed by update.manifest (remove)", fileName : "10text0", @@ -203,9 +167,7 @@ const TEST_FILES = [ originalContents : "ToBeDeleted\n", compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }, { description : "Removed by update.manifest (remove)", fileName : "00text1", @@ -213,9 +175,7 @@ const TEST_FILES = [ originalContents : "ToBeDeleted\n", compareContents : null, originalFile : null, - compareFile : null, - originalPerms : null, - comparePerms : null + compareFile : null }]; ADDITIONAL_TEST_DIRS = [ diff --git a/toolkit/mozapps/update/tests/unit_service_updater/marStageFailurePartialSvc.js b/toolkit/mozapps/update/tests/unit_service_updater/marStageFailurePartialSvc.js index 5beb3eb9dcca..c5fb7c2693fa 100644 --- a/toolkit/mozapps/update/tests/unit_service_updater/marStageFailurePartialSvc.js +++ b/toolkit/mozapps/update/tests/unit_service_updater/marStageFailurePartialSvc.js @@ -17,7 +17,7 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0767, + originalPerms : 0o767, comparePerms : null }, { description : "Not added for failed update (add)", @@ -27,8 +27,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete_precomplete", compareFile : "complete_precomplete", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not added for failed update (add)", fileName : "searchpluginstext0", @@ -37,8 +37,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0775 + originalPerms : 0o775, + comparePerms : 0o775 }, { description : "Not patched for failed update (patch-if)", fileName : "searchpluginspng1.png", @@ -47,8 +47,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not patched for failed update (patch-if)", fileName : "searchpluginspng0.png", @@ -57,8 +57,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not added for failed update (add-if)", fileName : "extensions1text0", @@ -77,8 +77,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not patched for failed update (patch-if)", fileName : "extensions1png0.png", @@ -87,8 +87,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not added for failed update (add-if)", fileName : "extensions0text0", @@ -97,8 +97,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Not patched for failed update (patch-if)", fileName : "extensions0png1.png", @@ -107,8 +107,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Not patched for failed update (patch-if)", fileName : "extensions0png0.png", @@ -117,8 +117,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Not patched for failed update (patch)", fileName : "exe0.exe", @@ -127,8 +127,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0755, - comparePerms : 0755 + originalPerms : 0o755, + comparePerms : 0o755 }, { description : "Not patched for failed update (patch) and causes " + "LoadSourceFile failed", @@ -138,8 +138,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "partial.png", - originalPerms : 0755, - comparePerms : 0755 + originalPerms : 0o755, + comparePerms : 0o755 }, { description : "Not added for failed update (add)", fileName : "00text0", @@ -158,8 +158,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not added for failed update (add)", fileName : "20text0", @@ -198,8 +198,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeDeleted\n", originalFile : null, compareFile : null, - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Not removed for failed update (remove)", fileName : "00text1", @@ -208,8 +208,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeDeleted\n", originalFile : null, compareFile : null, - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }]; ADDITIONAL_TEST_DIRS = [ diff --git a/toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessCompleteSvc.js b/toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessCompleteSvc.js index 17b1ac1ea6d1..af2319714dff 100644 --- a/toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessCompleteSvc.js +++ b/toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessCompleteSvc.js @@ -17,8 +17,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0767, - comparePerms : 0767 + originalPerms : 0o767, + comparePerms : 0o767 }, { description : "Added by update.manifest (add)", fileName : "precomplete", @@ -27,8 +27,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial_precomplete", compareFile : "complete_precomplete", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -37,8 +37,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginspng1.png", @@ -48,7 +48,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginspng0.png", @@ -57,8 +57,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "removed-files", @@ -67,8 +67,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial_removed-files", compareFile : "complete_removed-files", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -79,7 +79,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -89,8 +89,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -101,7 +101,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -112,7 +112,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -123,7 +123,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -134,7 +134,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "exe0.exe", @@ -143,8 +143,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0777, - comparePerms : 0755 + originalPerms : 0o777, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "10text0", @@ -153,8 +153,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0767, - comparePerms : 0644 + originalPerms : 0o767, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "0exe0.exe", @@ -163,8 +163,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0777, - comparePerms : 0755 + originalPerms : 0o777, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "00text1", @@ -173,8 +173,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0677, - comparePerms : 0644 + originalPerms : 0o677, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -183,8 +183,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00png0.png", @@ -193,8 +193,8 @@ const TEST_FILES = [ compareContents : null, originalFile : null, compareFile : "complete.png", - originalPerms : 0776, - comparePerms : 0644 + originalPerms : 0o776, + comparePerms : 0o644 }, { description : "Removed by precomplete (remove)", fileName : "20text0", diff --git a/toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessPartialSvc.js b/toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessPartialSvc.js index 2ddc5462d31b..31d8d8c57444 100644 --- a/toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessPartialSvc.js +++ b/toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessPartialSvc.js @@ -17,7 +17,7 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0644, + originalPerms : 0o644, comparePerms : null }, { description : "Added by update.manifest (add)", @@ -27,8 +27,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete_precomplete", compareFile : "partial_precomplete", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -37,8 +37,8 @@ const TEST_FILES = [ compareContents : "FromPartial\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -48,8 +48,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -59,8 +59,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -71,7 +71,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -81,8 +81,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -92,8 +92,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -103,8 +103,8 @@ const TEST_FILES = [ compareContents : "FromPartial\n", originalFile : null, compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -114,8 +114,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -125,8 +125,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Patched by update.manifest (patch)", fileName : "exe0.exe", @@ -135,8 +135,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0755, - comparePerms : 0755 + originalPerms : 0o755, + comparePerms : 0o755 }, { description : "Patched by update.manifest (patch)", fileName : "0exe0.exe", @@ -145,8 +145,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0755, - comparePerms : 0755 + originalPerms : 0o755, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -155,8 +155,8 @@ const TEST_FILES = [ compareContents : "FromPartial\n", originalFile : null, compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Patched by update.manifest (patch)", fileName : "00png0.png", @@ -165,8 +165,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Added by update.manifest (add)", fileName : "20text0", @@ -176,7 +176,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "20png0.png", @@ -186,7 +186,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "partial.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00text2", @@ -196,7 +196,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Removed by update.manifest (remove)", fileName : "10text0", diff --git a/toolkit/mozapps/update/tests/unit_service_updater/marSuccessCompleteSvc.js b/toolkit/mozapps/update/tests/unit_service_updater/marSuccessCompleteSvc.js index 967bf0929e88..3e4d816c6fb0 100644 --- a/toolkit/mozapps/update/tests/unit_service_updater/marSuccessCompleteSvc.js +++ b/toolkit/mozapps/update/tests/unit_service_updater/marSuccessCompleteSvc.js @@ -17,8 +17,8 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0767, - comparePerms : 0767 + originalPerms : 0o767, + comparePerms : 0o767 }, { description : "Added by update.manifest (add)", fileName : "precomplete", @@ -27,8 +27,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial_precomplete", compareFile : "complete_precomplete", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -37,8 +37,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginspng1.png", @@ -48,7 +48,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginspng0.png", @@ -57,8 +57,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "removed-files", @@ -67,8 +67,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial_removed-files", compareFile : "complete_removed-files", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -79,7 +79,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -89,8 +89,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -101,7 +101,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -112,7 +112,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -123,7 +123,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -134,7 +134,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "complete.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "exe0.exe", @@ -143,8 +143,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0777, - comparePerms : 0755 + originalPerms : 0o777, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "10text0", @@ -153,8 +153,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0767, - comparePerms : 0644 + originalPerms : 0o767, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "0exe0.exe", @@ -163,8 +163,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "partial.png", compareFile : "complete.png", - originalPerms : 0777, - comparePerms : 0755 + originalPerms : 0o777, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "00text1", @@ -173,8 +173,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0677, - comparePerms : 0644 + originalPerms : 0o677, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -183,8 +183,8 @@ const TEST_FILES = [ compareContents : "FromComplete\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00png0.png", @@ -193,8 +193,8 @@ const TEST_FILES = [ compareContents : null, originalFile : null, compareFile : "complete.png", - originalPerms : 0776, - comparePerms : 0644 + originalPerms : 0o776, + comparePerms : 0o644 }, { description : "Removed by precomplete (remove)", fileName : "20text0", diff --git a/toolkit/mozapps/update/tests/unit_service_updater/marSuccessPartialSvc.js b/toolkit/mozapps/update/tests/unit_service_updater/marSuccessPartialSvc.js index 9ee641f4b436..5f5e00ad20b6 100644 --- a/toolkit/mozapps/update/tests/unit_service_updater/marSuccessPartialSvc.js +++ b/toolkit/mozapps/update/tests/unit_service_updater/marSuccessPartialSvc.js @@ -17,7 +17,7 @@ const TEST_FILES = [ compareContents : "ShouldNotBeReplaced\n", originalFile : null, compareFile : null, - originalPerms : 0644, + originalPerms : 0o644, comparePerms : null }, { description : "Added by update.manifest (add)", @@ -27,8 +27,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete_precomplete", compareFile : "partial_precomplete", - originalPerms : 0666, - comparePerms : 0644 + originalPerms : 0o666, + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "searchpluginstext0", @@ -37,8 +37,8 @@ const TEST_FILES = [ compareContents : "FromPartial\n", originalFile : null, compareFile : null, - originalPerms : 0775, - comparePerms : 0644 + originalPerms : 0o775, + comparePerms : 0o644 }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -48,8 +48,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Patched by update.manifest if the file exists " + "(patch-if)", @@ -59,8 +59,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -71,7 +71,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -81,8 +81,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -92,8 +92,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Added by update.manifest if the parent directory " + "exists (add-if)", @@ -103,8 +103,8 @@ const TEST_FILES = [ compareContents : "FromPartial\n", originalFile : null, compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -114,8 +114,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Patched by update.manifest if the parent directory " + "exists (patch-if)", @@ -125,8 +125,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Patched by update.manifest (patch)", fileName : "exe0.exe", @@ -135,8 +135,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0755, - comparePerms : 0755 + originalPerms : 0o755, + comparePerms : 0o755 }, { description : "Patched by update.manifest (patch)", fileName : "0exe0.exe", @@ -145,8 +145,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0755, - comparePerms : 0755 + originalPerms : 0o755, + comparePerms : 0o755 }, { description : "Added by update.manifest (add)", fileName : "00text0", @@ -155,8 +155,8 @@ const TEST_FILES = [ compareContents : "FromPartial\n", originalFile : null, compareFile : null, - originalPerms : 0644, - comparePerms : 0644 + originalPerms : 0o644, + comparePerms : 0o644 }, { description : "Patched by update.manifest (patch)", fileName : "00png0.png", @@ -165,8 +165,8 @@ const TEST_FILES = [ compareContents : null, originalFile : "complete.png", compareFile : "partial.png", - originalPerms : 0666, - comparePerms : 0666 + originalPerms : 0o666, + comparePerms : 0o666 }, { description : "Added by update.manifest (add)", fileName : "20text0", @@ -176,7 +176,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "20png0.png", @@ -186,7 +186,7 @@ const TEST_FILES = [ originalFile : null, compareFile : "partial.png", originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Added by update.manifest (add)", fileName : "00text2", @@ -196,7 +196,7 @@ const TEST_FILES = [ originalFile : null, compareFile : null, originalPerms : null, - comparePerms : 0644 + comparePerms : 0o644 }, { description : "Removed by update.manifest (remove)", fileName : "10text0",