Bug 1449255: Part 20 - Remove test_bug567184.js, which is covered by other tests. r?aswan
MozReview-Commit-ID: GePi1xlzZnO
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug567184/bootstrap.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/* exported startup, shutdown, install, uninstall */
-function install(data, reason) { }
-
-function startup(data, reason) { }
-
-function shutdown(data, reason) { }
-
-function uninstall(data, reason) {}
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug567184/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>bug567184@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Bug 567184 Test</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>undefined</em:minVersion>
- <em:maxVersion>undefined</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug567184.js
+++ /dev/null
@@ -1,53 +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();
-
- run_test_1();
-}
-
-// Tests that installing doesn't require a restart
-function run_test_1() {
- prepare_test({ }, [
- "onNewInstall"
- ]);
-
- AddonManager.getInstallForFile(do_get_addon("test_bug567184"), function(install) {
- ensure_test_completed();
-
- Assert.notEqual(install, null);
-
- prepare_test({
- "bug567184@tests.mozilla.org": [
- ["onInstalling", false],
- "onInstalled"
- ]
- }, [
- "onInstallStarted",
- "onInstallEnded",
- ], check_test_1);
- install.install();
- });
-}
-
-function check_test_1() {
- AddonManager.getAllInstalls(function(installs) {
- // There should be no active installs now since the install completed and
- // doesn't require a restart.
- Assert.equal(installs.length, 0);
-
- AddonManager.getAddonByID("bug567184@tests.mozilla.org", function(b1) {
- Assert.notEqual(b1, null);
- Assert.ok(b1.appDisabled);
- Assert.ok(!b1.userDisabled);
- Assert.ok(!b1.isActive);
-
- executeSoon(do_test_finished);
- });
- });
-}
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -75,17 +75,16 @@ skip-if = true # Bug 1358846 Bug 1365021
[test_bug1180901_2.js]
skip-if = os != "win"
[test_bug514327_2.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"
tags = blocklist
[test_bug521905.js]
[test_bug566626.js]
-[test_bug567184.js]
[test_bug569138.js]
[test_bug570173.js]
[test_bug587088.js]
skip-if = os == "win" # Bug 1358846
[test_bug595081.js]
[test_bug596607.js]
[test_cache_certdb.js]
run-if = addon_signing