Backed out changeset 4b3b3f0c6440 (bug 953156) for xpcshell failures
authorEd Morley <emorley@mozilla.com>
Mon, 06 Jan 2014 11:31:52 +0000
changeset 162179 ae51b76a9c882609c66485c768cf64ca63be1f2c
parent 162178 4b3b3f0c6440ce87603291e41e4c143fa8c5b3f0
child 162180 93fe56269382e012a6b28ea1eb6c90ae90130584
push idunknown
push userunknown
push dateunknown
bugs953156
milestone29.0a1
backs out4b3b3f0c6440ce87603291e41e4c143fa8c5b3f0
Backed out changeset 4b3b3f0c6440 (bug 953156) for xpcshell failures
toolkit/mozapps/extensions/XPIProvider.jsm
toolkit/mozapps/extensions/test/xpcshell/test_bug953156.js
toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
--- a/toolkit/mozapps/extensions/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/XPIProvider.jsm
@@ -4286,17 +4286,17 @@ var XPIProvider = {
       try {
         this.bootstrapScopes[aId][aMethod](params, aReason);
       }
       catch (e) {
         WARN("Exception running bootstrap method " + aMethod + " on " + aId, e);
       }
     }
     finally {
-      if (aMethod == "shutdown" && aReason != BOOTSTRAP_REASONS.APP_SHUTDOWN) {
+      if (aMethod == "shutdown") {
         LOG("Removing manifest for " + aFile.path);
         Components.manager.removeBootstrappedManifestLocation(aFile);
       }
       this.setTelemetry(aId, aMethod + "_MS", new Date() - timeStart);
     }
   },
 
   /**
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug953156.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-function run_test() {
-  do_test_pending();
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-  startupManager();
-
-  prepare_test({ }, [
-    "onNewInstall"
-  ]);
-
-  AddonManager.getInstallForFile(do_get_addon("test_bug675371"), function(install) {
-    ensure_test_completed();
-
-    do_check_neq(install, null);
-
-    prepare_test({
-      "bug675371@tests.mozilla.org": [
-        ["onInstalling", false],
-        "onInstalled"
-      ]
-    }, [
-      "onInstallStarted",
-      "onInstallEnded"
-    ], callback_soon(check_test));
-    install.install();
-  });
-}
-
-function check_test() {
-  AddonManager.getAddonByID("bug675371@tests.mozilla.org", do_exception_wrap(function(addon) {
-    do_check_neq(addon, null);
-    do_check_true(addon.isActive);
-
-    // Tests that chrome.manifest is registered when the addon is installed.
-    var target = { active: false };
-    Services.scriptloader.loadSubScript("chrome://bug675371/content/test.js", target);
-    do_check_true(target.active);
-
-    shutdownManager();
-
-    // Tests that chrome.manifest remains registered at app shutdown.
-    target.active = false;
-    Services.scriptloader.loadSubScript("chrome://bug675371/content/test.js", target);
-    do_check_true(target.active);
-
-    do_execute_soon(do_test_finished);
-  }));
-}
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
@@ -135,17 +135,16 @@ fail-if = os == "android"
 [test_bug619730.js]
 [test_bug620837.js]
 [test_bug655254.js]
 [test_bug659772.js]
 [test_bug675371.js]
 [test_bug740612.js]
 [test_bug753900.js]
 [test_bug757663.js]
-[test_bug953156.js]
 [test_cacheflush.js]
 [test_checkcompatibility.js]
 [test_childprocess.js]
 [test_ChromeManifestParser.js]
 [test_compatoverrides.js]
 [test_corrupt.js]
 [test_corrupt_strictcompat.js]
 [test_corruptfile.js]