Bug 1449255: Part 15 - Remove test_bug740612, which is no longer useful. r?aswan draft
authorKris Maglione <maglione.k@gmail.com>
Tue, 27 Mar 2018 15:56:30 -0700
changeset 773484 ea518b3b520ef8950aa90180a9c0f9faf4616cbf
parent 773483 20cad80e076767421768f4fe0305986dc15a2e3c
child 773485 7ed46a14843e359b3c8eee388d8eff18d75e457d
push id104243
push usermaglione.k@gmail.com
push dateWed, 28 Mar 2018 00:15:32 +0000
reviewersaswan
bugs1449255, 740612
milestone61.0a1
Bug 1449255: Part 15 - Remove test_bug740612, which is no longer useful. r?aswan MozReview-Commit-ID: GIz5omgP8RR
toolkit/mozapps/extensions/test/addons/test_bug740612_1/bootstrap.js
toolkit/mozapps/extensions/test/addons/test_bug740612_1/install.rdf
toolkit/mozapps/extensions/test/addons/test_bug740612_2/bootstrap.js
toolkit/mozapps/extensions/test/addons/test_bug740612_2/install.rdf
toolkit/mozapps/extensions/test/xpcshell/test_bug740612.js
toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug740612_1/bootstrap.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/* exported APP_STARTUP */
-const APP_STARTUP = 1;
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug740612_1/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>bug740612_1@tests.mozilla.org</em:id>
-    <em:version>1.0</em:version>
-    <em:bootstrap>true</em:bootstrap>
-
-    <!-- Front End MetaData -->
-    <em:name>Test Bootstrap 1</em:name>
-    <em:description>Test Description</em:description>
-
-    <em:targetApplication>
-      <Description>
-        <em:id>xpcshell@tests.mozilla.org</em:id>
-        <em:minVersion>1</em:minVersion>
-        <em:maxVersion>1</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
-  </Description>
-</RDF>
deleted file mode 100644
--- 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);
-}
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug740612_2/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>bug740612_2@tests.mozilla.org</em:id>
-    <em:version>1.0</em:version>
-    <em:bootstrap>true</em:bootstrap>
-
-    <!-- Front End MetaData -->
-    <em:name>Test Bootstrap 2</em:name>
-    <em:description>Test Description</em:description>
-
-    <em:targetApplication>
-      <Description>
-        <em:id>xpcshell@tests.mozilla.org</em:id>
-        <em:minVersion>1</em:minVersion>
-        <em:maxVersion>1</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
-  </Description>
-</RDF>
deleted file mode 100644
--- 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);
-  });
-}
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -88,17 +88,17 @@ skip-if = os == "win" # Bug 1358846
 [test_bug616841.js]
 # Bug 676992: test consistently fails on Android
 fail-if = os == "android"
 [test_bug619730.js]
 tags = blocklist
 [test_bug620837.js]
 tags = blocklist
 [test_bug655254.js]
-[test_bug740612.js]
+[test_bug675371.js]
 [test_cache_certdb.js]
 run-if = addon_signing
 [test_cacheflush.js]
 [test_childprocess.js]
 [test_compatoverrides.js]
 [test_corrupt.js]
 [test_corruptfile.js]
 [test_crash_annotation_quoting.js]