mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1447903: Part 17 - Update test_bug335238.js to use only bootstrapped extensions. r=aswan 

MozReview-Commit-ID: WpgkmPV35X

--HG--
extra : rebase_source : 2c9e98d4ddb2f733b8d07c8b77759e8e3bb6a80f
This commit is contained in:
Kris Maglione 2018-03-21 23:19:40 -07:00
Родитель 8dbc8fdb3a
Коммит e86ecd664b
6 изменённых файлов: 58 добавлений и 118 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

22
toolkit/mozapps/extensions/test/addons/test_bug335238_1/install.rdf
Просмотреть файл

@ -1,22 +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>bug335238_1@tests.mozilla.org</em:id>
<em:version>1.3.4</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>5</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 335238</em:name>
<em:updateURL>http://example.com/0?id=%ITEM_ID%&amp;version=%ITEM_VERSION%&amp;maxAppVersion=%ITEM_MAXAPPVERSION%&amp;status=%ITEM_STATUS%&amp;appId=%APP_ID%&amp;appVersion=%APP_VERSION%&amp;appOs=%APP_OS%&amp;appAbi=%APP_ABI%&amp;locale=%APP_LOCALE%&amp;reqVersion=%REQ_VERSION%</em:updateURL>
</Description>
</RDF>

30
toolkit/mozapps/extensions/test/addons/test_bug335238_2/install.rdf
Просмотреть файл

@ -1,30 +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>bug335238_2@tests.mozilla.org</em:id>
<em:version>28at</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>7</em:maxVersion>
</Description>
</em:targetApplication>
<em:requires>
<Description>
<em:id>unknown@tests.mozilla.org</em:id>
<em:minVersion>2</em:minVersion>
<em:maxVersion>72</em:maxVersion>
</Description>
</em:requires>
<em:name>Bug 335238</em:name>
<em:updateURL>http://example.com/1?id=%ITEM_ID%&amp;version=%ITEM_VERSION%&amp;maxAppVersion=%ITEM_MAXAPPVERSION%&amp;status=%ITEM_STATUS%&amp;appId=%APP_ID%&amp;appVersion=%APP_VERSION%&amp;appOs=%APP_OS%&amp;appAbi=%APP_ABI%&amp;locale=%APP_LOCALE%&amp;reqVersion=%REQ_VERSION%</em:updateURL>
</Description>
</RDF>

30
toolkit/mozapps/extensions/test/addons/test_bug335238_3/install.rdf
Просмотреть файл

@ -1,30 +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>bug335238_3@tests.mozilla.org</em:id>
<em:version>58</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>*</em:maxVersion>
</Description>
</em:targetApplication>
<em:requires>
<Description>
<em:id>unknown@tests.mozilla.org</em:id>
<em:minVersion>2</em:minVersion>
<em:maxVersion>72</em:maxVersion>
</Description>
</em:requires>
<em:name>Bug 335238</em:name>
<em:updateURL>http://example.com/2?id=%ITEM_ID%&amp;version=%ITEM_VERSION%&amp;maxAppVersion=%ITEM_MAXAPPVERSION%&amp;status=%ITEM_STATUS%&amp;appId=%APP_ID%&amp;appVersion=%APP_VERSION%&amp;appOs=%APP_OS%&amp;appAbi=%APP_ABI%&amp;locale=%APP_LOCALE%&amp;reqVersion=%REQ_VERSION%</em:updateURL>
</Description>
</RDF>

30
toolkit/mozapps/extensions/test/addons/test_bug335238_4/install.rdf
Просмотреть файл

@ -1,30 +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>bug335238_4@tests.mozilla.org</em:id>
<em:version>4</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2+</em:maxVersion>
</Description>
</em:targetApplication>
<em:requires>
<Description>
<em:id>unknown@tests.mozilla.org</em:id>
<em:minVersion>2</em:minVersion>
<em:maxVersion>72</em:maxVersion>
</Description>
</em:requires>
<em:name>Bug 335238</em:name>
<em:updateURL>http://example.com/3?id=%ITEM_ID%&amp;version=%ITEM_VERSION%&amp;maxAppVersion=%ITEM_MAXAPPVERSION%&amp;status=%ITEM_STATUS%&amp;appId=%APP_ID%&amp;appVersion=%APP_VERSION%&amp;appOs=%APP_OS%&amp;appAbi=%APP_ABI%&amp;locale=%APP_LOCALE%&amp;reqVersion=%REQ_VERSION%</em:updateURL>
</Description>
</RDF>

1
toolkit/mozapps/extensions/test/xpcshell/head_addons.js
Просмотреть файл

@ -76,7 +76,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "aomStartup",
// 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",

63
toolkit/mozapps/extensions/test/xpcshell/test_bug335238.js
Просмотреть файл

@ -60,15 +60,68 @@ var EXPECTED = [
}
];
const MANIFESTS = [
{
id: "bug335238_1@tests.mozilla.org",
version: "1.3.4",
name: "Bug 335238",
updateURL: "http://example.com/0?id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appId=%APP_ID%&appVersion=%APP_VERSION%&appOs=%APP_OS%&appAbi=%APP_ABI%&locale=%APP_LOCALE%&reqVersion=%REQ_VERSION%",
bootstrap: true,
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
maxVersion: "5"}],
},
{
id: "bug335238_2@tests.mozilla.org",
version: "28at",
name: "Bug 335238",
updateURL: "http://example.com/1?id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appId=%APP_ID%&appVersion=%APP_VERSION%&appOs=%APP_OS%&appAbi=%APP_ABI%&locale=%APP_LOCALE%&reqVersion=%REQ_VERSION%",
bootstrap: true,
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
maxVersion: "7"}],
},
{
id: "bug335238_3@tests.mozilla.org",
version: "58",
name: "Bug 335238",
updateURL: "http://example.com/2?id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appId=%APP_ID%&appVersion=%APP_VERSION%&appOs=%APP_OS%&appAbi=%APP_ABI%&locale=%APP_LOCALE%&reqVersion=%REQ_VERSION%",
bootstrap: true,
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
maxVersion: "*"}],
},
{
id: "bug335238_4@tests.mozilla.org",
version: "4",
name: "Bug 335238",
updateURL: "http://example.com/3?id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appId=%APP_ID%&appVersion=%APP_VERSION%&appOs=%APP_OS%&appAbi=%APP_ABI%&locale=%APP_LOCALE%&reqVersion=%REQ_VERSION%",
bootstrap: true,
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
maxVersion: "2+"}],
},
];
const XPIS = MANIFESTS.map(manifest => createTempXPIFile(manifest));
var ADDONS = [
{id: "bug335238_1@tests.mozilla.org",
addon: "test_bug335238_1"},
addon: XPIS[0]},
{id: "bug335238_2@tests.mozilla.org",
addon: "test_bug335238_2"},
addon: XPIS[1]},
{id: "bug335238_3@tests.mozilla.org",
addon: "test_bug335238_3"},
addon: XPIS[2]},
{id: "bug335238_4@tests.mozilla.org",
addon: "test_bug335238_4"}
addon: XPIS[3]}
];
// This is a replacement for the blocklist service
@ -155,7 +208,7 @@ function run_test() {
Services.locale.setRequestedLocales(["en-US"]);
startupManager();
installAllFiles(ADDONS.map(a => do_get_addon(a.addon)), function() {
installAllFiles(ADDONS.map(a => a.addon), function() {
restartManager();
AddonManager.getAddonByID(ADDONS[1].id, callback_soon(function(addon) {