Bug 1447903: Part 16 - Update test_signed_verify.js to use only bootstrapped extensions. r?aswan draft
authorKris Maglione <maglione.k@gmail.com>
Wed, 21 Mar 2018 23:09:52 -0700
changeset 772387 3c1295b26d913ef5fbb3ca5ce9470d2ce8bb53b9
parent 772386 4286d2dd9c535db621a3e8c22d67ecfe6a44fcae
child 772388 acf26c09f7921707f2b05af789b4a9451fd8b152
push id103897
push usermaglione.k@gmail.com
push dateMon, 26 Mar 2018 01:31:53 +0000
reviewersaswan
bugs1447903
milestone61.0a1
Bug 1447903: Part 16 - Update test_signed_verify.js to use only bootstrapped extensions. r?aswan MozReview-Commit-ID: H7vnuGMtNJH
toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_1/install.rdf
toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_1/test.txt
toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_2/install.rdf
toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_2/test.txt
toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_2.xpi
toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_badid_2.xpi
toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/unsigned_nonbootstrap_2.xpi
toolkit/mozapps/extensions/test/xpcshell/head_addons.js
toolkit/mozapps/extensions/test/xpcshell/test_signed_verify.js
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_1/install.rdf
+++ /dev/null
@@ -1,23 +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>test@tests.mozilla.org</em:id>
-    <em:version>1.0</em:version>
-
-    <!-- Front End MetaData -->
-    <em:name>Test Add-on</em:name>
-    <em:updateURL>http://localhost:4444/update.rdf</em:updateURL>
-
-    <em:targetApplication>
-      <Description>
-        <em:id>xpcshell@tests.mozilla.org</em:id>
-        <em:minVersion>2</em:minVersion>
-        <em:maxVersion>5</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
-  </Description>
-</RDF>
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_1/test.txt
+++ /dev/null
@@ -1,1 +0,0 @@
-This test file can be altered to break signing checks.
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_2/install.rdf
+++ /dev/null
@@ -1,23 +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>test@tests.mozilla.org</em:id>
-    <em:version>2.0</em:version>
-
-    <!-- Front End MetaData -->
-    <em:name>Test Add-on</em:name>
-    <em:updateURL>http://localhost:4444/update.rdf</em:updateURL>
-
-    <em:targetApplication>
-      <Description>
-        <em:id>xpcshell@tests.mozilla.org</em:id>
-        <em:minVersion>4</em:minVersion>
-        <em:maxVersion>6</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
-  </Description>
-</RDF>
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_2/test.txt
+++ /dev/null
@@ -1,1 +0,0 @@
-This test file can be altered to break signing checks.
deleted file mode 100644
index d6ddbcec38c8c9093cab75d0fc0eab3d316f42d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 5898d83e499daed0c245040b98c6da3ce3448316..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6ba1efd727a26604778641ad78abbb0027c0bb5d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
@@ -70,17 +70,16 @@ XPCOMUtils.defineLazyServiceGetter(this,
 
 // Whitelist existing tests that still use non-restartless extensions.
 const LEGACY_NON_RESTARTLESS_TESTS = new Set([
   "test_blocklistchange.js",
   "test_bug335238.js",
   "test_bug397778.js",
   "test_bug425657.js",
   "test_bug455906.js",
-  "test_signed_verify.js",
 ]);
 
 if (LEGACY_NON_RESTARTLESS_TESTS.has(_TEST_FILE[0].replace(/.*\//, ""))) {
   Services.prefs.setBoolPref("extensions.legacy.non-restartless.enabled", true);
 }
 
 const {
   awaitPromise,
--- a/toolkit/mozapps/extensions/test/xpcshell/test_signed_verify.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_signed_verify.js
@@ -8,25 +8,22 @@ Services.prefs.setBoolPref(PREF_EM_CHECK
 
 const DATA = "data/signing_checks/";
 let GOOD = [
   ["privileged_bootstrap_2.xpi", AddonManager.SIGNEDSTATE_PRIVILEGED],
 ];
 if (AppConstants.MOZ_ALLOW_LEGACY_EXTENSIONS) {
   GOOD.push(
     ["signed_bootstrap_2.xpi", AddonManager.SIGNEDSTATE_SIGNED],
-    ["signed_nonbootstrap_2.xpi", AddonManager.SIGNEDSTATE_SIGNED],
   );
 }
 
 const BAD = [
   ["unsigned_bootstrap_2.xpi", AddonManager.SIGNEDSTATE_MISSING],
   ["signed_bootstrap_badid_2.xpi", AddonManager.SIGNEDSTATE_BROKEN],
-  ["unsigned_nonbootstrap_2.xpi", AddonManager.SIGNEDSTATE_MISSING],
-  ["signed_nonbootstrap_badid_2.xpi", AddonManager.SIGNEDSTATE_BROKEN],
 ];
 const ID = "test@tests.mozilla.org";
 
 const profileDir = gProfD.clone();
 profileDir.append("extensions");
 
 function verifySignatures() {
   return new Promise(resolve => {