diff options
Diffstat (limited to 'toolkit/mozapps/extensions/test/xpcshell/test_distribution.js')
-rw-r--r-- | toolkit/mozapps/extensions/test/xpcshell/test_distribution.js | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_distribution.js b/toolkit/mozapps/extensions/test/xpcshell/test_distribution.js index 720b454cc..9f5bfacca 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/test_distribution.js +++ b/toolkit/mozapps/extensions/test/xpcshell/test_distribution.js @@ -68,7 +68,7 @@ function setOldModificationTime() { extension.append("addon1@tests.mozilla.org"); else extension.append("addon1@tests.mozilla.org.xpi"); - setExtensionModifiedTime(extension, Date.now() - MAKE_FILE_OLD_DIFFERENCE); + setExtensionModifiedTime(extension, Date.now - 10000); startupManager(false); } @@ -78,11 +78,9 @@ function run_test() { run_test_1(); } -// Tests that on the first startup the add-on gets installed, with now as the -// profile modifiedTime. +// Tests that on the first startup the add-on gets installed function run_test_1() { - let extension = writeInstallRDFForExtension(addon1_1, distroDir); - setExtensionModifiedTime(extension, Date.now() - MAKE_FILE_OLD_DIFFERENCE); + writeInstallRDFForExtension(addon1_1, distroDir); startupManager(); @@ -93,15 +91,6 @@ function run_test_1() { do_check_eq(a1.scope, AddonManager.SCOPE_PROFILE); do_check_false(a1.foreignInstall); - // Modification time should be updated when the addon is copied to the - // profile. - let testURI = a1.getResourceURI(TEST_UNPACKED ? "install.rdf" : ""); - let testFile = testURI.QueryInterface(Components.interfaces.nsIFileURL).file; - - do_check_true(testFile.exists()); - let difference = testFile.lastModifiedTime - Date.now(); - do_check_true(Math.abs(difference) < MAX_TIME_DIFFERENCE); - do_execute_soon(run_test_2); }); } @@ -165,8 +154,8 @@ function run_test_5() { restartManager(); - AddonManager.getAddonByID("addon1@tests.mozilla.org", function(a1_2) { - do_check_eq(a1_2, null); + AddonManager.getAddonByID("addon1@tests.mozilla.org", function(a1) { + do_check_eq(a1, null); do_execute_soon(run_test_6); }); |