From cf2629d6f0f0992986977a90678596e71229f1f0 Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Tue, 27 Mar 2018 15:56:30 -0700 Subject: [PATCH] Bug 1449255: Part 15 - Remove test_bug740612, which is no longer useful. r=aswan MozReview-Commit-ID: GIz5omgP8RR --HG-- extra : rebase_source : 04b9927fc6f1bb4d5cdb2d6ed45264d6bbc83a17 --- .../test/addons/test_bug740612_1/bootstrap.js | 2 - .../test/addons/test_bug740612_1/install.rdf | 24 ----------- .../test/addons/test_bug740612_2/bootstrap.js | 24 ----------- .../test/addons/test_bug740612_2/install.rdf | 24 ----------- .../test/xpcshell/test_bug740612.js | 40 ------------------- .../extensions/test/xpcshell/xpcshell.ini | 1 - 6 files changed, 115 deletions(-) delete mode 100644 toolkit/mozapps/extensions/test/addons/test_bug740612_1/bootstrap.js delete mode 100644 toolkit/mozapps/extensions/test/addons/test_bug740612_1/install.rdf delete mode 100644 toolkit/mozapps/extensions/test/addons/test_bug740612_2/bootstrap.js delete mode 100644 toolkit/mozapps/extensions/test/addons/test_bug740612_2/install.rdf delete mode 100644 toolkit/mozapps/extensions/test/xpcshell/test_bug740612.js diff --git a/toolkit/mozapps/extensions/test/addons/test_bug740612_1/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_bug740612_1/bootstrap.js deleted file mode 100644 index c231fcbc086d..000000000000 --- a/toolkit/mozapps/extensions/test/addons/test_bug740612_1/bootstrap.js +++ /dev/null @@ -1,2 +0,0 @@ -/* exported APP_STARTUP */ -const APP_STARTUP = 1; diff --git a/toolkit/mozapps/extensions/test/addons/test_bug740612_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug740612_1/install.rdf deleted file mode 100644 index b2316273f91a..000000000000 --- a/toolkit/mozapps/extensions/test/addons/test_bug740612_1/install.rdf +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - bug740612_1@tests.mozilla.org - 1.0 - true - - - Test Bootstrap 1 - Test Description - - - - xpcshell@tests.mozilla.org - 1 - 1 - - - - - diff --git a/toolkit/mozapps/extensions/test/addons/test_bug740612_2/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_bug740612_2/bootstrap.js deleted file mode 100644 index 779ce073e798..000000000000 --- a/toolkit/mozapps/extensions/test/addons/test_bug740612_2/bootstrap.js +++ /dev/null @@ -1,24 +0,0 @@ -/* exported startup, shutdown, install, uninstall */ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -const VERSION = "1.0"; - -function install(data, reason) { - Services.prefs.setIntPref("bootstraptest.installed_version", VERSION); - Services.prefs.setIntPref("bootstraptest.install_reason", reason); -} - -function startup(data, reason) { - Services.prefs.setIntPref("bootstraptest.active_version", VERSION); - Services.prefs.setIntPref("bootstraptest.startup_reason", reason); -} - -function shutdown(data, reason) { - Services.prefs.setIntPref("bootstraptest.active_version", 0); - Services.prefs.setIntPref("bootstraptest.shutdown_reason", reason); -} - -function uninstall(data, reason) { - Services.prefs.setIntPref("bootstraptest.installed_version", 0); - Services.prefs.setIntPref("bootstraptest.uninstall_reason", reason); -} diff --git a/toolkit/mozapps/extensions/test/addons/test_bug740612_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug740612_2/install.rdf deleted file mode 100644 index ff4d613ef2f2..000000000000 --- a/toolkit/mozapps/extensions/test/addons/test_bug740612_2/install.rdf +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - bug740612_2@tests.mozilla.org - 1.0 - true - - - Test Bootstrap 2 - Test Description - - - - xpcshell@tests.mozilla.org - 1 - 1 - - - - - diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug740612.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug740612.js deleted file mode 100644 index dd443eea8a48..000000000000 --- a/toolkit/mozapps/extensions/test/xpcshell/test_bug740612.js +++ /dev/null @@ -1,40 +0,0 @@ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ - */ - -// This verifies that attempts to override the global values fails but doesn't -// destroy the world with it -createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2"); - -const profileDir = gProfD.clone(); -profileDir.append("extensions"); - -function getActiveVersion() { - return Services.prefs.getIntPref("bootstraptest.active_version"); -} - -function getInstalledVersion() { - return Services.prefs.getIntPref("bootstraptest.installed_version"); -} - -function run_test() { - do_test_pending(); - - manuallyInstall(do_get_addon("test_bug740612_1"), profileDir, - "bug740612_1@tests.mozilla.org"); - manuallyInstall(do_get_addon("test_bug740612_2"), profileDir, - "bug740612_2@tests.mozilla.org"); - - startupManager(); - - AddonManager.getAddonsByIDs(["bug740612_1@tests.mozilla.org", - "bug740612_2@tests.mozilla.org"], - function([a1, a2]) { - Assert.notEqual(a1, null); - Assert.notEqual(a2, null); - Assert.equal(getInstalledVersion(), "1.0"); - Assert.equal(getActiveVersion(), "1.0"); - - executeSoon(do_test_finished); - }); -} diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini index ffad8d63d28d..dd2625ac0f66 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini +++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini @@ -92,7 +92,6 @@ tags = blocklist [test_bug620837.js] tags = blocklist [test_bug655254.js] -[test_bug740612.js] [test_cache_certdb.js] run-if = addon_signing [test_cacheflush.js]