| author | Kris Maglione <maglione.k@gmail.com> |
| Thu, 22 Mar 2018 00:03:56 -0700 | |
| changeset 772391 | 278c54957071f8eb8a5ad145346d78f2f7e17fbe |
| parent 772390 | aa6ac28311db9ff6111e81201f8886ed483e3072 |
| child 772392 | 285654a4eebb6ec53955ba7c5e20cd82bc6278ff |
| child 772397 | 4504718fb08e54c5557a5a3fc9c7c293ee538dc8 |
| push id | 103897 |
| push user | maglione.k@gmail.com |
| push date | Mon, 26 Mar 2018 01:31:53 +0000 |
| reviewers | aswan |
| bugs | 1447903 |
| milestone | 61.0a1 |
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_1/install.rdf +++ /dev/null @@ -1,18 +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>hardblock@tests.mozilla.org</em:id> - <em:version>1.0</em:version> - <em:name>Hardblocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_2/install.rdf +++ /dev/null @@ -1,18 +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>hardblock@tests.mozilla.org</em:id> - <em:version>2.0</em:version> - <em:name>Hardblocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_3/install.rdf +++ /dev/null @@ -1,18 +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>hardblock@tests.mozilla.org</em:id> - <em:version>3.0</em:version> - <em:name>Hardblocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_1/install.rdf +++ /dev/null @@ -1,18 +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>regexpblock@tests.mozilla.org</em:id> - <em:version>1.0</em:version> - <em:name>RegExp-blocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_2/install.rdf +++ /dev/null @@ -1,18 +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>regexpblock@tests.mozilla.org</em:id> - <em:version>2.0</em:version> - <em:name>RegExp-blocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_3/install.rdf +++ /dev/null @@ -1,18 +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>regexpblock@tests.mozilla.org</em:id> - <em:version>3.0</em:version> - <em:name>RegExp-blocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_1/install.rdf +++ /dev/null @@ -1,18 +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>softblock1@tests.mozilla.org</em:id> - <em:version>1.0</em:version> - <em:name>Softblocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_2/install.rdf +++ /dev/null @@ -1,18 +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>softblock1@tests.mozilla.org</em:id> - <em:version>2.0</em:version> - <em:name>Softblocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_3/install.rdf +++ /dev/null @@ -1,18 +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>softblock1@tests.mozilla.org</em:id> - <em:version>3.0</em:version> - <em:name>Softblocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_1/install.rdf +++ /dev/null @@ -1,18 +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>softblock2@tests.mozilla.org</em:id> - <em:version>1.0</em:version> - <em:name>Softblocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_2/install.rdf +++ /dev/null @@ -1,18 +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>softblock2@tests.mozilla.org</em:id> - <em:version>2.0</em:version> - <em:name>Softblocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_3/install.rdf +++ /dev/null @@ -1,18 +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>softblock2@tests.mozilla.org</em:id> - <em:version>3.0</em:version> - <em:name>Softblocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_1/install.rdf +++ /dev/null @@ -1,18 +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>softblock3@tests.mozilla.org</em:id> - <em:version>1.0</em:version> - <em:name>Softblocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_2/install.rdf +++ /dev/null @@ -1,18 +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>softblock3@tests.mozilla.org</em:id> - <em:version>2.0</em:version> - <em:name>Softblocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_3/install.rdf +++ /dev/null @@ -1,18 +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>softblock3@tests.mozilla.org</em:id> - <em:version>3.0</em:version> - <em:name>Softblocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_1/install.rdf +++ /dev/null @@ -1,18 +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>softblock4@tests.mozilla.org</em:id> - <em:version>1.0</em:version> - <em:name>Softblocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_2/install.rdf +++ /dev/null @@ -1,18 +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>softblock4@tests.mozilla.org</em:id> - <em:version>2.0</em:version> - <em:name>Softblocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_3/install.rdf +++ /dev/null @@ -1,18 +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>softblock4@tests.mozilla.org</em:id> - <em:version>3.0</em:version> - <em:name>Softblocked add-on</em:name> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_1/install.rdf +++ /dev/null @@ -1,19 +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>softblock5@tests.mozilla.org</em:id> - <em:version>1.0</em:version> - <em:name>Softblocked add-on</em:name> - <em:internalName>test/1.0</em:internalName> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_2/install.rdf +++ /dev/null @@ -1,19 +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>softblock5@tests.mozilla.org</em:id> - <em:version>2.0</em:version> - <em:name>Softblocked add-on</em:name> - <em:internalName>test/1.0</em:internalName> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
deleted file mode 100644 --- a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_3/install.rdf +++ /dev/null @@ -1,19 +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>softblock5@tests.mozilla.org</em:id> - <em:version>3.0</em:version> - <em:name>Softblocked add-on</em:name> - <em:internalName>test/1.0</em:internalName> - <em:targetApplication> - <Description> - <em:id>xpcshell@tests.mozilla.org</em:id> - <em:minVersion>1</em:minVersion> - <em:maxVersion>3</em:maxVersion> - </Description> - </em:targetApplication> - </Description> -</RDF>
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update1.json +++ b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update1.json @@ -5,98 +5,98 @@ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "2", - "update_link": "http://localhost:%PORT%/addons/blocklist_soft1_2.xpi" + "update_link": "http://example.com/addons/blocklist_soft1_2.xpi" } ] }, "softblock3@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "2", - "update_link": "http://localhost:%PORT%/addons/blocklist_soft3_2.xpi" + "update_link": "http://example.com/addons/blocklist_soft3_2.xpi" } ] }, "softblock5@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "2", - "update_link": "http://localhost:%PORT%/addons/blocklist_soft5_2.xpi" + "update_link": "http://example.com/addons/blocklist_soft5_2.xpi" } ] }, "softblock4@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "2", - "update_link": "http://localhost:%PORT%/addons/blocklist_soft4_2.xpi" + "update_link": "http://example.com/addons/blocklist_soft4_2.xpi" } ] }, "softblock2@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "2", - "update_link": "http://localhost:%PORT%/addons/blocklist_soft2_2.xpi" + "update_link": "http://example.com/addons/blocklist_soft2_2.xpi" } ] }, "regexpblock@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "2", - "update_link": "http://localhost:%PORT%/addons/blocklist_regexp1_2.xpi" + "update_link": "http://example.com/addons/blocklist_regexp1_2.xpi" } ] }, "hardblock@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "2", - "update_link": "http://localhost:%PORT%/addons/blocklist_hard1_2.xpi" + "update_link": "http://example.com/addons/blocklist_hard1_2.xpi" } ] } } }
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update2.json +++ b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update2.json @@ -5,98 +5,98 @@ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "3", - "update_link": "http://localhost:%PORT%/addons/blocklist_soft1_3.xpi" + "update_link": "http://example.com/addons/blocklist_soft1_3.xpi" } ] }, "softblock3@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "3", - "update_link": "http://localhost:%PORT%/addons/blocklist_soft3_3.xpi" + "update_link": "http://example.com/addons/blocklist_soft3_3.xpi" } ] }, "regexpblock@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "3", - "update_link": "http://localhost:%PORT%/addons/blocklist_regexp1_3.xpi" + "update_link": "http://example.com/addons/blocklist_regexp1_3.xpi" } ] }, "hardblock@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "3", - "update_link": "http://localhost:%PORT%/addons/blocklist_hard1_3.xpi" + "update_link": "http://example.com/addons/blocklist_hard1_3.xpi" } ] }, "softblock5@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "3", - "update_link": "http://localhost:%PORT%/addons/blocklist_soft5_3.xpi" + "update_link": "http://example.com/addons/blocklist_soft5_3.xpi" } ] }, "softblock4@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "3", - "update_link": "http://localhost:%PORT%/addons/blocklist_soft4_3.xpi" + "update_link": "http://example.com/addons/blocklist_soft4_3.xpi" } ] }, "softblock2@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "3", - "update_link": "http://localhost:%PORT%/addons/blocklist_soft2_3.xpi" + "update_link": "http://example.com/addons/blocklist_soft2_3.xpi" } ] } } }
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update3.json +++ b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update3.json @@ -5,98 +5,98 @@ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "4", - "update_link": "http://localhost:%PORT%/addons/blocklist_regexp1_1.xpi" + "update_link": "http://example.com/addons/blocklist_regexp1_1.xpi" } ] }, "hardblock@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "4", - "update_link": "http://localhost:%PORT%/addons/blocklist_hard1_1.xpi" + "update_link": "http://example.com/addons/blocklist_hard1_1.xpi" } ] }, "softblock5@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "4", - "update_link": "http://localhost:%PORT%/addons/blocklist_soft5_1.xpi" + "update_link": "http://example.com/addons/blocklist_soft5_1.xpi" } ] }, "softblock4@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "4", - "update_link": "http://localhost:%PORT%/addons/blocklist_soft4_1.xpi" + "update_link": "http://example.com/addons/blocklist_soft4_1.xpi" } ] }, "softblock3@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "4", - "update_link": "http://localhost:%PORT%/addons/blocklist_soft3_1.xpi" + "update_link": "http://example.com/addons/blocklist_soft3_1.xpi" } ] }, "softblock2@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "4", - "update_link": "http://localhost:%PORT%/addons/blocklist_soft2_1.xpi" + "update_link": "http://example.com/addons/blocklist_soft2_1.xpi" } ] }, "softblock1@tests.mozilla.org": { "updates": [ { "applications": { "gecko": { "strict_min_version": "0", "advisory_max_version": "*" } }, "version": "4", - "update_link": "http://localhost:%PORT%/addons/blocklist_soft1_1.xpi" + "update_link": "http://example.com/addons/blocklist_soft1_1.xpi" } ] } } }
--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js +++ b/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js @@ -26,241 +26,432 @@ const URI_EXTENSION_BLOCKLIST_DIALOG = "chrome://mozapps/content/extensions/blocklist.xul"; ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); ChromeUtils.import("resource://testing-common/MockRegistrar.jsm"); // Allow insecure updates Services.prefs.setBoolPref("extensions.checkUpdateSecurity", false); -var testserver = createHttpServer(); +var testserver = AddonTestUtils.createHttpServer({hosts: ["example.com"]}); gPort = testserver.identity.primaryPort; -// register static files with server and interpolate port numbers in them -mapFile("/data/blocklistchange/addon_update1.json", testserver); -mapFile("/data/blocklistchange/addon_update2.json", testserver); -mapFile("/data/blocklistchange/addon_update3.json", testserver); -mapFile("/data/blocklistchange/addon_change.xml", testserver); -mapFile("/data/blocklistchange/app_update.xml", testserver); -mapFile("/data/blocklistchange/blocklist_update1.xml", testserver); -mapFile("/data/blocklistchange/blocklist_update2.xml", testserver); -mapFile("/data/blocklistchange/manual_update.xml", testserver); +testserver.registerDirectory("/data/", do_get_file("data")); -testserver.registerDirectory("/addons/", do_get_file("addons")); +const ADDONS = { + "blocklist_hard1_1": { + id: "hardblock@tests.mozilla.org", + version: "1.0", + name: "Hardblocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_hard1_2": { + id: "hardblock@tests.mozilla.org", + version: "2.0", + name: "Hardblocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_hard1_3": { + id: "hardblock@tests.mozilla.org", + version: "3.0", + name: "Hardblocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_regexp1_1": { + id: "regexpblock@tests.mozilla.org", + version: "1.0", + name: "RegExp-blocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_regexp1_2": { + id: "regexpblock@tests.mozilla.org", + version: "2.0", + name: "RegExp-blocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_regexp1_3": { + id: "regexpblock@tests.mozilla.org", + version: "3.0", + name: "RegExp-blocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_soft1_1": { + id: "softblock1@tests.mozilla.org", + version: "1.0", + name: "Softblocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_soft1_2": { + id: "softblock1@tests.mozilla.org", + version: "2.0", + name: "Softblocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_soft1_3": { + id: "softblock1@tests.mozilla.org", + version: "3.0", + name: "Softblocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_soft2_1": { + id: "softblock2@tests.mozilla.org", + version: "1.0", + name: "Softblocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_soft2_2": { + id: "softblock2@tests.mozilla.org", + version: "2.0", + name: "Softblocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_soft2_3": { + id: "softblock2@tests.mozilla.org", + version: "3.0", + name: "Softblocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_soft3_1": { + id: "softblock3@tests.mozilla.org", + version: "1.0", + name: "Softblocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_soft3_2": { + id: "softblock3@tests.mozilla.org", + version: "2.0", + name: "Softblocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_soft3_3": { + id: "softblock3@tests.mozilla.org", + version: "3.0", + name: "Softblocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_soft4_1": { + id: "softblock4@tests.mozilla.org", + version: "1.0", + name: "Softblocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_soft4_2": { + id: "softblock4@tests.mozilla.org", + version: "2.0", + name: "Softblocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_soft4_3": { + id: "softblock4@tests.mozilla.org", + version: "3.0", + name: "Softblocked add-on", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_soft5_1": { + id: "softblock5@tests.mozilla.org", + version: "1.0", + name: "Softblocked add-on", + internalName: "test/1.0", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_soft5_2": { + id: "softblock5@tests.mozilla.org", + version: "2.0", + name: "Softblocked add-on", + internalName: "test/1.0", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, + "blocklist_soft5_3": { + id: "softblock5@tests.mozilla.org", + version: "3.0", + name: "Softblocked add-on", + internalName: "test/1.0", + targetApplications: [{ + id: "xpcshell@tests.mozilla.org", + minVersion: "1", + maxVersion: "3"}], + }, +}; +const XPIS = {}; + +for (let [name, manifest] of Object.entries(ADDONS)) { + XPIS[name] = createTempXPIFile(manifest); + testserver.registerFile(`/addons/${name}.xpi`, XPIS[name]); +} var softblock1_1 = { id: "softblock1@tests.mozilla.org", version: "1.0", name: "Softblocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update1.json", + updateURL: "http://example.com/data/blocklistchange/addon_update1.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var softblock1_2 = { id: "softblock1@tests.mozilla.org", version: "2.0", name: "Softblocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update2.json", + updateURL: "http://example.com/data/blocklistchange/addon_update2.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var softblock1_3 = { id: "softblock1@tests.mozilla.org", version: "3.0", name: "Softblocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update3.json", + updateURL: "http://example.com/data/blocklistchange/addon_update3.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var softblock2_1 = { id: "softblock2@tests.mozilla.org", version: "1.0", name: "Softblocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update1.json", + updateURL: "http://example.com/data/blocklistchange/addon_update1.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var softblock2_2 = { id: "softblock2@tests.mozilla.org", version: "2.0", name: "Softblocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update2.json", + updateURL: "http://example.com/data/blocklistchange/addon_update2.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var softblock2_3 = { id: "softblock2@tests.mozilla.org", version: "3.0", name: "Softblocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update3.json", + updateURL: "http://example.com/data/blocklistchange/addon_update3.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var softblock3_1 = { id: "softblock3@tests.mozilla.org", version: "1.0", name: "Softblocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update1.json", + updateURL: "http://example.com/data/blocklistchange/addon_update1.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var softblock3_2 = { id: "softblock3@tests.mozilla.org", version: "2.0", name: "Softblocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update2.json", + updateURL: "http://example.com/data/blocklistchange/addon_update2.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var softblock3_3 = { id: "softblock3@tests.mozilla.org", version: "3.0", name: "Softblocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update3.json", + updateURL: "http://example.com/data/blocklistchange/addon_update3.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var softblock4_1 = { id: "softblock4@tests.mozilla.org", version: "1.0", name: "Softblocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update1.json", + updateURL: "http://example.com/data/blocklistchange/addon_update1.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var softblock4_2 = { id: "softblock4@tests.mozilla.org", version: "2.0", name: "Softblocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update2.json", + updateURL: "http://example.com/data/blocklistchange/addon_update2.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var softblock4_3 = { id: "softblock4@tests.mozilla.org", version: "3.0", name: "Softblocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update3.json", + updateURL: "http://example.com/data/blocklistchange/addon_update3.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var hardblock_1 = { id: "hardblock@tests.mozilla.org", version: "1.0", name: "Hardblocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update1.json", + updateURL: "http://example.com/data/blocklistchange/addon_update1.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var hardblock_2 = { id: "hardblock@tests.mozilla.org", version: "2.0", name: "Hardblocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update2.json", + updateURL: "http://example.com/data/blocklistchange/addon_update2.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var hardblock_3 = { id: "hardblock@tests.mozilla.org", version: "3.0", name: "Hardblocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update3.json", + updateURL: "http://example.com/data/blocklistchange/addon_update3.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var regexpblock_1 = { id: "regexpblock@tests.mozilla.org", version: "1.0", name: "RegExp-blocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update1.json", + updateURL: "http://example.com/data/blocklistchange/addon_update1.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var regexpblock_2 = { id: "regexpblock@tests.mozilla.org", version: "2.0", name: "RegExp-blocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update2.json", + updateURL: "http://example.com/data/blocklistchange/addon_update2.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; var regexpblock_3 = { id: "regexpblock@tests.mozilla.org", version: "3.0", name: "RegExp-blocked add-on", - updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update3.json", + updateURL: "http://example.com/data/blocklistchange/addon_update3.json", targetApplications: [{ id: "xpcshell@tests.mozilla.org", minVersion: "1", maxVersion: "3" }] }; const ADDON_IDS = ["softblock1@tests.mozilla.org", @@ -336,17 +527,17 @@ function Pload_blocklist(aFile) { let blocklist_updated = new Promise((resolve, reject) => { Services.obs.addObserver(function observer() { Services.obs.removeObserver(observer, "blocklist-updated"); resolve(); }, "blocklist-updated"); }); - Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:" + gPort + "/data/blocklistchange/" + aFile); + Services.prefs.setCharPref("extensions.blocklist.url", "http://example.com/data/blocklistchange/" + aFile); var blocklist = Cc["@mozilla.org/extensions/blocklist;1"]. getService(Ci.nsITimerCallback); blocklist.notify(null); return blocklist_updated; } // Does a background update check for add-ons and returns a promise that // resolves when any started installs complete @@ -1131,22 +1322,22 @@ add_task(async function run_local_instal getFileForAddon(profileDir, softblock3_1.id).remove(true); getFileForAddon(profileDir, softblock4_1.id).remove(true); getFileForAddon(profileDir, hardblock_1.id).remove(true); getFileForAddon(profileDir, regexpblock_1.id).remove(true); startupManager(false); await promiseInstallAllFiles([ - do_get_file("addons/blocklist_soft1_1.xpi"), - do_get_file("addons/blocklist_soft2_1.xpi"), - do_get_file("addons/blocklist_soft3_1.xpi"), - do_get_file("addons/blocklist_soft4_1.xpi"), - do_get_file("addons/blocklist_hard1_1.xpi"), - do_get_file("addons/blocklist_regexp1_1.xpi") + XPIS.blocklist_soft1_1, + XPIS.blocklist_soft2_1, + XPIS.blocklist_soft3_1, + XPIS.blocklist_soft4_1, + XPIS.blocklist_hard1_1, + XPIS.blocklist_regexp1_1, ]); let aInstalls = await AddonManager.getAllInstalls(); // Should have finished all installs without needing to restart Assert.equal(aInstalls.length, 0); let [s1, s2, s3, /* s4 */, h, r] = await promiseAddonsByIDs(ADDON_IDS);