--- a/toolkit/mozapps/extensions/test/xpcshell/test_temporary.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_temporary.js
@@ -485,21 +485,26 @@ add_task(function*() {
yield AddonManager.installTemporaryAddon(unpackedAddon);
// Increment the version number, re-install it, and make sure it
// gets marked as an upgrade.
writeInstallRDFToDir(Object.assign({}, sampleRDFManifest, {
version: "2.0"
}), tempdir, "bootstrap1@tests.mozilla.org");
+ const onShutdown = waitForBootstrapEvent("shutdown", ID);
const onUninstall = waitForBootstrapEvent("uninstall", ID);
const onInstall = waitForBootstrapEvent("install", ID);
const onStartup = waitForBootstrapEvent("startup", ID);
yield AddonManager.installTemporaryAddon(unpackedAddon);
+ const shutdown = yield onShutdown;
+ equal(shutdown.data.version, "1.0");
+ equal(shutdown.reason, BOOTSTRAP_REASONS.ADDON_UPGRADE);
+
const uninstall = yield onUninstall;
equal(uninstall.data.version, "1.0");
equal(uninstall.reason, BOOTSTRAP_REASONS.ADDON_UPGRADE);
const install = yield onInstall;
equal(install.data.version, "2.0");
equal(install.reason, BOOTSTRAP_REASONS.ADDON_UPGRADE);
@@ -530,21 +535,26 @@ add_task(function*() {
yield AddonManager.installTemporaryAddon(unpackedAddon);
// Decrement the version number, re-install, and make sure
// it gets marked as a downgrade.
writeInstallRDFToDir(Object.assign({}, sampleRDFManifest, {
version: "0.8"
}), tempdir, "bootstrap1@tests.mozilla.org");
+ const onShutdown = waitForBootstrapEvent("shutdown", ID);
const onUninstall = waitForBootstrapEvent("uninstall", ID);
const onInstall = waitForBootstrapEvent("install", ID);
const onStartup = waitForBootstrapEvent("startup", ID);
yield AddonManager.installTemporaryAddon(unpackedAddon);
+ const shutdown = yield onShutdown;
+ equal(shutdown.data.version, "1.0");
+ equal(shutdown.reason, BOOTSTRAP_REASONS.ADDON_DOWNGRADE);
+
const uninstall = yield onUninstall;
equal(uninstall.data.version, "1.0");
equal(uninstall.reason, BOOTSTRAP_REASONS.ADDON_DOWNGRADE);
const install = yield onInstall;
equal(install.data.version, "0.8");
equal(install.reason, BOOTSTRAP_REASONS.ADDON_DOWNGRADE);
@@ -583,21 +593,26 @@ add_task(function*() {
const initialStartup = yield onInitialStartup;
equal(initialStartup.data.version, "1.0");
equal(initialStartup.reason, BOOTSTRAP_REASONS.ADDON_INSTALL);
let info = BootstrapMonitor.started.get(ID);
do_check_eq(info.reason, BOOTSTRAP_REASONS.ADDON_INSTALL);
// Install it again.
+ const onShutdown = waitForBootstrapEvent("shutdown", ID);
const onUninstall = waitForBootstrapEvent("uninstall", ID);
const onInstall = waitForBootstrapEvent("install", ID);
const onStartup = waitForBootstrapEvent("startup", ID);
yield AddonManager.installTemporaryAddon(unpackedAddon);
+ const shutdown = yield onShutdown;
+ equal(shutdown.data.version, "1.0");
+ equal(shutdown.reason, BOOTSTRAP_REASONS.ADDON_UPGRADE);
+
const uninstall = yield onUninstall;
equal(uninstall.data.version, "1.0");
equal(uninstall.reason, BOOTSTRAP_REASONS.ADDON_UPGRADE);
const reInstall = yield onInstall;
equal(reInstall.data.version, "1.0");
equal(reInstall.reason, BOOTSTRAP_REASONS.ADDON_UPGRADE);