--- a/toolkit/components/extensions/test/xpcshell/head.js
+++ b/toolkit/components/extensions/test/xpcshell/head.js
@@ -10,92 +10,37 @@ ChromeUtils.import("resource://testing-c
XPCOMUtils.defineLazyModuleGetters(this, {
ContentTask: "resource://testing-common/ContentTask.jsm",
Extension: "resource://gre/modules/Extension.jsm",
ExtensionData: "resource://gre/modules/Extension.jsm",
ExtensionParent: "resource://gre/modules/ExtensionParent.jsm",
ExtensionTestUtils: "resource://testing-common/ExtensionXPCShellUtils.jsm",
FileUtils: "resource://gre/modules/FileUtils.jsm",
- HttpServer: "resource://testing-common/httpd.js",
NetUtil: "resource://gre/modules/NetUtil.jsm",
Schemas: "resource://gre/modules/Schemas.jsm",
});
-XPCOMUtils.defineLazyServiceGetter(this, "proxyService",
- "@mozilla.org/network/protocol-proxy-service;1",
- "nsIProtocolProxyService");
-
// These values may be changed in later head files and tested in check_remote
// below.
Services.prefs.setBoolPref("extensions.webextensions.remote", false);
const testEnv = {
expectRemote: false,
};
add_task(function check_remote() {
Assert.equal(WebExtensionPolicy.useRemoteWebExtensions, testEnv.expectRemote, "useRemoteWebExtensions matches");
Assert.equal(WebExtensionPolicy.isExtensionProcess, !testEnv.expectRemote, "testing from extension process");
});
ExtensionTestUtils.init(this);
-/**
- * Creates a new HttpServer for testing, and begins listening on the
- * specified port. Automatically shuts down the server when the test
- * unit ends.
- *
- * @param {object} [options = {}]
- * @param {integer} [options.port = -1]
- * The port to listen on. If omitted, listen on a random
- * port. The latter is the preferred behavior.
- * @param {sequence<string>?} [options.hosts = null]
- * A set of hosts to accept connections to. Support for this is
- * implemented using a proxy filter.
- *
- * @returns {HttpServer}
- */
-function createHttpServer({port = -1, hosts} = {}) {
- let server = new HttpServer();
- server.start(port);
-
- if (hosts) {
- hosts = new Set(hosts);
- const serverHost = "localhost";
- const serverPort = server.identity.primaryPort;
-
- for (let host of hosts) {
- server.identity.add("http", host, 80);
- }
-
- const proxyFilter = {
- proxyInfo: proxyService.newProxyInfo("http", serverHost, serverPort, 0, 4096, null),
-
- applyFilter(service, channel, defaultProxyInfo, callback) {
- if (hosts.has(channel.URI.host)) {
- callback.onProxyFilterResult(this.proxyInfo);
- } else {
- callback.onProxyFilterResult(defaultProxyInfo);
- }
- },
- };
-
- proxyService.registerChannelFilter(proxyFilter, 0);
- registerCleanupFunction(() => {
- proxyService.unregisterChannelFilter(proxyFilter);
- });
- }
-
- registerCleanupFunction(() => {
- return new Promise(resolve => {
- server.stop(resolve);
- });
- });
-
- return server;
+var createHttpServer = (...args) => {
+ AddonTestUtils.maybeInit(this);
+ return AddonTestUtils.createHttpServer(...args);
}
if (AppConstants.platform === "android") {
Services.io.offline = true;
}
/**
* Clears the HTTP and content image caches.
--- a/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm
@@ -26,24 +26,26 @@ const {OS} = ChromeUtils.import("resourc
ChromeUtils.defineModuleGetter(this, "Extension",
"resource://gre/modules/Extension.jsm");
XPCOMUtils.defineLazyGetter(this, "Management", () => {
let {Management} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
return Management;
});
-XPCOMUtils.defineLazyServiceGetter(this, "aomStartup",
- "@mozilla.org/addons/addon-manager-startup;1",
- "amIAddonManagerStartup");
-XPCOMUtils.defineLazyServiceGetter(this, "rdfService",
- "@mozilla.org/rdf/rdf-service;1", "nsIRDFService");
-XPCOMUtils.defineLazyServiceGetter(this, "uuidGen",
- "@mozilla.org/uuid-generator;1", "nsIUUIDGenerator");
+XPCOMUtils.defineLazyModuleGetters(this, {
+ HttpServer: "resource://testing-common/httpd.js",
+});
+XPCOMUtils.defineLazyServiceGetters(this, {
+ aomStartup: ["@mozilla.org/addons/addon-manager-startup;1", "amIAddonManagerStartup"],
+ proxyService: ["@mozilla.org/network/protocol-proxy-service;1", "nsIProtocolProxyService"],
+ rdfService: ["@mozilla.org/rdf/rdf-service;1", "nsIRDFService"],
+ uuidGen: ["@mozilla.org/uuid-generator;1", "nsIUUIDGenerator"],
+});
XPCOMUtils.defineLazyGetter(this, "AppInfo", () => {
let AppInfo = {};
ChromeUtils.import("resource://testing-common/AppInfo.jsm", AppInfo);
return AppInfo;
});
const PREF_DISABLE_SECURITY = ("security.turn_off_all_security_so_that_" +
@@ -210,16 +212,22 @@ var AddonTestUtils = {
addonsList: null,
appInfo: null,
addonStartup: null,
testUnpacked: false,
useRealCertChecks: false,
usePrivilegedSignatures: true,
overrideEntry: null,
+ maybeInit(testScope) {
+ if (this.testScope != testScope) {
+ this.init(testScope);
+ }
+ },
+
init(testScope) {
this.testScope = testScope;
// Get the profile directory for tests to use.
this.profileDir = testScope.do_get_profile();
this.profileExtensions = this.profileDir.clone();
this.profileExtensions.append("extensions");
@@ -359,16 +367,73 @@ var AddonTestUtils = {
try {
this.tempDir.remove(true);
} catch (e) {
Cu.reportError(e);
}
});
},
+ /**
+ * Creates a new HttpServer for testing, and begins listening on the
+ * specified port. Automatically shuts down the server when the test
+ * unit ends.
+ *
+ * @param {object} [options = {}]
+ * The options object.
+ * @param {integer} [options.port = -1]
+ * The port to listen on. If omitted, listen on a random
+ * port. The latter is the preferred behavior.
+ * @param {sequence<string>?} [options.hosts = null]
+ * A set of hosts to accept connections to. Support for this is
+ * implemented using a proxy filter.
+ *
+ * @returns {HttpServer}
+ * The HTTP server instance.
+ */
+ createHttpServer({port = -1, hosts} = {}) {
+ let server = new HttpServer();
+ server.start(port);
+
+ if (hosts) {
+ hosts = new Set(hosts);
+ const serverHost = "localhost";
+ const serverPort = server.identity.primaryPort;
+
+ for (let host of hosts) {
+ server.identity.add("http", host, 80);
+ }
+
+ const proxyFilter = {
+ proxyInfo: proxyService.newProxyInfo("http", serverHost, serverPort, 0, 4096, null),
+
+ applyFilter(service, channel, defaultProxyInfo, callback) {
+ if (hosts.has(channel.URI.host)) {
+ callback.onProxyFilterResult(this.proxyInfo);
+ } else {
+ callback.onProxyFilterResult(defaultProxyInfo);
+ }
+ },
+ };
+
+ proxyService.registerChannelFilter(proxyFilter, 0);
+ this.testScope.registerCleanupFunction(() => {
+ proxyService.unregisterChannelFilter(proxyFilter);
+ });
+ }
+
+ this.testScope.registerCleanupFunction(() => {
+ return new Promise(resolve => {
+ server.stop(resolve);
+ });
+ });
+
+ return server;
+ },
+
info(msg) {
// info() for mochitests, do_print for xpcshell.
let print = this.testScope.info || this.testScope.do_print;
print(msg);
},
cleanupTempXPIs() {
for (let file of this.tempXPIs.splice(0)) {
--- a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_1/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_AddonRepository_1/install.rdf
@@ -20,14 +20,14 @@
<em:description>XPI Add-on 1 - Description</em:description>
<em:creator>XPI Add-on 1 - Creator</em:creator>
<em:developer>XPI Add-on 1 - First Developer</em:developer>
<em:developer>XPI Add-on 1 - Second Developer</em:developer>
<em:translator>XPI Add-on 1 - First Translator</em:translator>
<em:translator>XPI Add-on 1 - Second Translator</em:translator>
<em:contributor>XPI Add-on 1 - First Contributor</em:contributor>
<em:contributor>XPI Add-on 1 - Second Contributor</em:contributor>
- <em:homepageURL>http://localhost/xpi/1/homepage.html</em:homepageURL>
- <em:optionsURL>http://localhost/xpi/1/options.html</em:optionsURL>
- <em:aboutURL>http://localhost/xpi/1/about.html</em:aboutURL>
- <em:iconURL>http://localhost/xpi/1/icon.png</em:iconURL>
+ <em:homepageURL>http://example.com/xpi/1/homepage.html</em:homepageURL>
+ <em:optionsURL>http://example.com/xpi/1/options.html</em:optionsURL>
+ <em:aboutURL>http://example.com/xpi/1/about.html</em:aboutURL>
+ <em:iconURL>http://example.com/xpi/1/icon.png</em:iconURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_2/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug299716_2/install.rdf
@@ -20,11 +20,11 @@
<Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>1.9</em:minVersion>
<em:maxVersion>1.9</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 299716</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716_2.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug299716_2.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_a_1/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug299716_a_1/install.rdf
@@ -11,11 +11,11 @@
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>5</em:minVersion>
<em:maxVersion>5</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 299716 test A</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug299716.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_a_2/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug299716_a_2/install.rdf
@@ -11,11 +11,11 @@
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>5</em:minVersion>
<em:maxVersion>5</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 299716 test A</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug299716.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_b_1/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug299716_b_1/install.rdf
@@ -10,11 +10,11 @@
<Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>1.9</em:minVersion>
<em:maxVersion>1.9</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 299716 test B</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug299716.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_b_2/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug299716_b_2/install.rdf
@@ -10,11 +10,11 @@
<Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>1.9</em:minVersion>
<em:maxVersion>1.9</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 299716 test B</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug299716.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_c_1/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug299716_c_1/install.rdf
@@ -20,11 +20,11 @@
<Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>1.9</em:minVersion>
<em:maxVersion>1.9</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 299716 test C</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug299716.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_c_2/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug299716_c_2/install.rdf
@@ -20,11 +20,11 @@
<Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>1.9</em:minVersion>
<em:maxVersion>1.9</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 299716 test C</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug299716.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_d_1/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug299716_d_1/install.rdf
@@ -20,11 +20,11 @@
<Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>30</em:minVersion>
<em:maxVersion>30</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 299716 test D</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug299716.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_d_2/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug299716_d_2/install.rdf
@@ -20,11 +20,11 @@
<Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>30</em:minVersion>
<em:maxVersion>30</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 299716 test D</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug299716.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_e_1/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug299716_e_1/install.rdf
@@ -20,11 +20,11 @@
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>30</em:minVersion>
<em:maxVersion>30</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 299716 test E</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug299716.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_e_2/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug299716_e_2/install.rdf
@@ -20,11 +20,11 @@
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>30</em:minVersion>
<em:maxVersion>30</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 299716 test E</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug299716.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_f_1/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug299716_f_1/install.rdf
@@ -20,11 +20,11 @@
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>30</em:minVersion>
<em:maxVersion>30</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 299716 test F</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug299716.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_f_2/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug299716_f_2/install.rdf
@@ -20,11 +20,11 @@
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>30</em:minVersion>
<em:maxVersion>30</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 299716 test F</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug299716.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_g_1/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug299716_g_1/install.rdf
@@ -11,11 +11,11 @@
<Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>30</em:minVersion>
<em:maxVersion>30</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 299716 test G</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug299716.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_g_2/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug299716_g_2/install.rdf
@@ -11,11 +11,11 @@
<Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>30</em:minVersion>
<em:maxVersion>30</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 299716 test G</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug299716.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_1/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug324121_1/install.rdf
@@ -13,13 +13,13 @@
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 324121 Test 1</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121_1.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug324121_1.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_2/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug324121_2/install.rdf
@@ -13,13 +13,13 @@
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 324121 Test 2</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug324121.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_3/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug324121_3/install.rdf
@@ -13,13 +13,13 @@
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 324121 Test 5</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug324121.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_4/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug324121_4/install.rdf
@@ -13,13 +13,13 @@
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 324121 Test 4</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121_4.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug324121_4.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_5/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug324121_5/install.rdf
@@ -13,13 +13,13 @@
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>3</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 324121 Test 5</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121_5.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug324121_5.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_6/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug324121_6/install.rdf
@@ -13,13 +13,13 @@
<Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 324121 Test 6</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug324121.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_7/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug324121_7/install.rdf
@@ -13,13 +13,13 @@
<Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 324121 Test 7</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug324121.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_8/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug324121_8/install.rdf
@@ -13,13 +13,13 @@
<Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 324121 Test 8</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121_8.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug324121_8.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_9/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug324121_9/install.rdf
@@ -13,13 +13,13 @@
<Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>3</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 324121 Test 9</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121_9.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_bug324121_9.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug335238_1/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug335238_1/install.rdf
@@ -11,12 +11,12 @@
<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://localhost:4444/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%</em:updateURL>
+ <em: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%</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug335238_2/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug335238_2/install.rdf
@@ -19,12 +19,12 @@
<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://localhost:4444/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%</em:updateURL>
+ <em: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%</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug335238_3/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug335238_3/install.rdf
@@ -19,12 +19,12 @@
<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://localhost:4444/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%</em:updateURL>
+ <em: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%</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug335238_4/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug335238_4/install.rdf
@@ -19,12 +19,12 @@
<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://localhost:4444/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%</em:updateURL>
+ <em: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%</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug394300_1/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug394300_1/install.rdf
@@ -11,12 +11,12 @@
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 394300 Test 1</em:name>
- <em:updateURL>http://localhost:4444/test_bug394300.rdf</em:updateURL>
+ <em:updateURL>http://example.com/test_bug394300.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_bug394300_2/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_bug394300_2/install.rdf
@@ -11,12 +11,12 @@
<Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>1.9</em:minVersion>
<em:maxVersion>1.9</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Bug 394300 Test 2</em:name>
- <em:updateURL>http://localhost:4444/test_bug394300.rdf</em:updateURL>
+ <em:updateURL>http://example.com/test_bug394300.rdf</em:updateURL>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/addons/test_install3/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_install3/install.rdf
@@ -8,17 +8,17 @@
<Description about="urn:mozilla:install-manifest">
<em:id>addon3@tests.mozilla.org</em:id>
<em:version>1.0</em:version>
<!-- Front End MetaData -->
<em:name>Real Test 4</em:name>
<em:description>Test Description</em:description>
- <em:updateURL>http://localhost:4444/data/test_install.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_install.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>0</em:maxVersion>
</Description>
</em:targetApplication>
--- a/toolkit/mozapps/extensions/test/addons/test_updateid1/install.rdf
+++ b/toolkit/mozapps/extensions/test/addons/test_updateid1/install.rdf
@@ -1,15 +1,15 @@
<?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>addon1@tests.mozilla.org</em:id>
<em:version>1.0</em:version>
- <em:updateURL>http://localhost:4444/data/test_updateid.rdf</em:updateURL>
+ <em:updateURL>http://example.com/data/test_updateid.rdf</em:updateURL>
<em:bootstrap>true</em:bootstrap>
<em:name>Test Addon 1</em:name>
<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>
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_cache.json
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_cache.json
@@ -10,125 +10,125 @@
"type": "extension",
"guid": "test_AddonRepository_1@tests.mozilla.org",
"current_version": {
"version": "2.1",
"files": [
{
"platform": "all",
"size": 9,
- "url": "http://localhost:4444/repo/1/install.xpi"
+ "url": "http://example.com/repo/1/install.xpi"
}
]
},
"authors": [
{
"name": "Repo Add-on 1 - Creator",
- "url": "http://localhost:4444/repo/1/creator.html"
+ "url": "http://example.com/repo/1/creator.html"
},
{
"name": "Repo Add-on 1 - First Developer",
- "url": "http://localhost:4444/repo/1/firstDeveloper.html"
+ "url": "http://example.com/repo/1/firstDeveloper.html"
},
{
"name": "Repo Add-on 1 - Second Developer",
- "url": "http://localhost:4444/repo/1/secondDeveloper.html"
+ "url": "http://example.com/repo/1/secondDeveloper.html"
}
],
"summary": "Repo Add-on 1 - Description<br>Second line",
"description": "<p>Repo Add-on 1 - Full Description & some extra</p>",
"icons": {
- "32": "http://localhost/repo/1/icon.png"
+ "32": "http://example.com/repo/1/icon.png"
},
"ratings": {
"count": 1234,
"text_count": 1111,
"average": 1
},
- "homepage": "http://localhost/repo/1/homepage.html",
- "support_url": "http://localhost/repo/1/support.html",
- "contributions_url": "http://localhost/repo/1/meetDevelopers.html",
- "ratings_url": "http://localhost/repo/1/review.html",
+ "homepage": "http://example.com/repo/1/homepage.html",
+ "support_url": "http://example.com/repo/1/support.html",
+ "contributions_url": "http://example.com/repo/1/meetDevelopers.html",
+ "ratings_url": "http://example.com/repo/1/review.html",
"weekly_downloads": 3331,
"last_updated": "1970-01-01T00:00:09Z"
},
{
"name": "Repo Add-on 2",
"type": "theme",
"guid": "test_AddonRepository_2@tests.mozilla.org",
"current_version": {
"version": "2.2",
"files": [
{
"platform": "all",
"size": 9,
- "url": "http://localhost:4444/repo/2/install.xpi"
+ "url": "http://example.com/repo/2/install.xpi"
}
]
},
"authors": [
{
"name": "Repo Add-on 2 - Creator",
- "url": "http://localhost:4444/repo/2/creator.html"
+ "url": "http://example.com/repo/2/creator.html"
},
{
"name": "Repo Add-on 2 - First Developer",
- "url": "http://localhost:4444/repo/2/firstDeveloper.html"
+ "url": "http://example.com/repo/2/firstDeveloper.html"
},
{
"name": "Repo Add-on 2 - Second Developer",
- "url": "http://localhost:4444/repo/2/secondDeveloper.html"
+ "url": "http://example.com/repo/2/secondDeveloper.html"
}
],
"summary": "Repo Add-on 2 - Description",
"description": "Repo Add-on 2 - Full Description",
"icons": {
- "32": "http://localhost/repo/2/icon.png"
+ "32": "http://example.com/repo/2/icon.png"
},
"previews": [
{
- "image_url": "http://localhost:4444/repo/2/firstFull.png",
- "thumbnail_url": "http://localhost:4444/repo/2/firstThumbnail.png",
+ "image_url": "http://example.com/repo/2/firstFull.png",
+ "thumbnail_url": "http://example.com/repo/2/firstThumbnail.png",
"caption": "Repo Add-on 2 - First Caption"
},
{
- "image_url": "http://localhost:4444/repo/2/secondFull.png",
- "thumbnail_url": "http://localhost:4444/repo/2/secondThumbnail.png",
+ "image_url": "http://example.com/repo/2/secondFull.png",
+ "thumbnail_url": "http://example.com/repo/2/secondThumbnail.png",
"caption": "Repo Add-on 2 - Second Caption"
}
],
"ratings": {
"count": 2223,
"text_count": 1112,
"average": 2
},
- "homepage": "http://localhost/repo/2/homepage.html",
- "support_url": "http://localhost/repo/2/support.html",
- "contributions_url": "http://localhost/repo/2/meetDevelopers.html",
- "ratings_url": "http://localhost/repo/2/review.html",
+ "homepage": "http://example.com/repo/2/homepage.html",
+ "support_url": "http://example.com/repo/2/support.html",
+ "contributions_url": "http://example.com/repo/2/meetDevelopers.html",
+ "ratings_url": "http://example.com/repo/2/review.html",
"weekly_downloads": 3332,
"last_updated": "1970-01-01T00:00:09Z"
},
{
"name": "Repo Add-on 3",
"type": "theme",
"guid": "test_AddonRepository_3@tests.mozilla.org",
"current_version": {
"version": "2.3"
},
"icons": {
- "32": "http://localhost/repo/3/icon.png"
+ "32": "http://example.com/repo/3/icon.png"
},
"previews": [
{
- "image_url": "http://localhost:4444/repo/3/firstFull.png",
- "thumbnail_url": "http://localhost:4444/repo/3/firstThumbnail.png",
+ "image_url": "http://example.com/repo/3/firstFull.png",
+ "thumbnail_url": "http://example.com/repo/3/firstThumbnail.png",
"caption": "Repo Add-on 3 - First Caption"
},
{
- "image_url": "http://localhost:4444/repo/3/secondFull.png",
- "thumbnail_url": "http://localhost:4444/repo/3/secondThumbnail.png",
+ "image_url": "http://example.com/repo/3/secondFull.png",
+ "thumbnail_url": "http://example.com/repo/3/secondThumbnail.png",
"caption": "Repo Add-on 3 - Second Caption"
}
]
}
]
}
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug299716.rdf
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/test_bug299716.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE RDF:RDF [
<!ENTITY bug299716 "urn:mozilla:extension:bug299716">
- <!ENTITY addons_prefix "http://localhost:4444/addons/test_bug299716">
+ <!ENTITY addons_prefix "http://example.com/addons/test_bug299716">
<!ENTITY v0.2 "<em:version>0.2</em:version>">
<!ENTITY xpcshell.app "
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>5</em:minVersion>
<em:maxVersion>5</em:maxVersion>
">
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug324121.rdf
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/test_bug324121.rdf
@@ -10,17 +10,17 @@
<RDF:li>
<RDF:Description>
<em:version>2</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>3</em:minVersion>
<em:maxVersion>3</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
</RDF:Seq>
</em:updates>
</RDF:Description>
@@ -31,17 +31,17 @@
<RDF:li>
<RDF:Description>
<em:version>2</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>2</em:minVersion>
<em:maxVersion>2</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
</RDF:Seq>
</em:updates>
</RDF:Description>
@@ -52,17 +52,17 @@
<RDF:li>
<RDF:Description>
<em:version>2</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>3</em:minVersion>
<em:maxVersion>3</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
</RDF:Seq>
</em:updates>
</RDF:Description>
@@ -73,17 +73,17 @@
<RDF:li>
<RDF:Description>
<em:version>2</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>2</em:minVersion>
<em:maxVersion>2</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
</RDF:Seq>
</em:updates>
</RDF:Description>
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug394300.rdf
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/test_bug394300.rdf
@@ -10,72 +10,72 @@
<RDF:li>
<RDF:Description>
<em:version>20</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>2</em:minVersion>
<em:maxVersion>2</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
<!-- Valid install should be the version detected -->
<RDF:li>
<RDF:Description>
<em:version>10</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
<!-- Valid install. Detecting this would indicate that the order
of entries is playing a part in the update detection. -->
<RDF:li>
<RDF:Description>
<em:version>6</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
<!-- Not a valid install - no minVersion or maxVersion specified -->
<RDF:li>
<RDF:Description>
<em:version>40</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
<!-- Not a valid install - incompatible app versions -->
<RDF:li>
<RDF:Description>
<em:version>30</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>2</em:minVersion>
<em:maxVersion>2</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
</RDF:Seq>
</em:updates>
</RDF:Description>
@@ -86,72 +86,72 @@
<RDF:li>
<RDF:Description>
<em:version>20</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>2</em:minVersion>
<em:maxVersion>2</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
<!-- Valid install should be the version detected -->
<RDF:li>
<RDF:Description>
<em:version>10</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>1.9</em:minVersion>
<em:maxVersion>1.9</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
<!-- Valid install. Detecting this would indicate that the order
of entries is playing a part in the update detection. -->
<RDF:li>
<RDF:Description>
<em:version>6</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>1.9</em:minVersion>
<em:maxVersion>1.9</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
<!-- Not a valid install - no minVersion or maxVersion specified -->
<RDF:li>
<RDF:Description>
<em:version>40</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>toolkit@mozilla.org</em:id>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
<!-- Not a valid install - incompatible app versions -->
<RDF:li>
<RDF:Description>
<em:version>30</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>2</em:minVersion>
<em:maxVersion>2</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
</RDF:Seq>
</em:updates>
</RDF:Description>
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecheck.rdf
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecheck.rdf
@@ -10,73 +10,73 @@
<li>
<Description>
<em:version>1.0</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
- <em:updateLink>https://localhost:4444/addons/test1.xpi</em:updateLink>
+ <em:updateLink>https://example.com/addons/test1.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
</li>
<!-- This update is incompatible and so should not be considered a valid
update -->
<li>
<Description>
<em:version>2.0</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>2</em:minVersion>
<em:maxVersion>2</em:maxVersion>
- <em:updateLink>https://localhost:4444/addons/test2.xpi</em:updateLink>
+ <em:updateLink>https://example.com/addons/test2.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
</li>
<li>
<Description>
<em:version>3.0</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
- <em:updateLink>https://localhost:4444/addons/test3.xpi</em:updateLink>
+ <em:updateLink>https://example.com/addons/test3.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
</li>
<li>
<Description>
<em:version>2.0</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
- <em:updateLink>https://localhost:4444/addons/test2.xpi</em:updateLink>
+ <em:updateLink>https://example.com/addons/test2.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
</li>
<!-- This update is incompatible and so should not be considered a valid
update -->
<li>
<Description>
<em:version>4.0</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>2</em:minVersion>
<em:maxVersion>2</em:maxVersion>
- <em:updateLink>https://localhost:4444/addons/test4.xpi</em:updateLink>
+ <em:updateLink>https://example.com/addons/test4.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
</li>
</Seq>
</em:updates>
</Description>
@@ -89,17 +89,17 @@
<RDF:li>
<RDF:Description>
<em:version>2.0</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
</RDF:Seq>
</em:updates>
</RDF:Description>
@@ -112,17 +112,17 @@
<RDF:li>
<RDF:Description>
<em:version>2.0</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
</RDF:Seq>
</em:updates>
<em:signature>MIGTMA0GCSqGSIb3DQEBBQUAA4GBAMO1O2gwSCCth1GwYMgscfaNakpN40PJfOWt
ub2HVdg8+OXMciF8d/9eVWm8eH/IxuxyZlmRZTs3O5tv9eWAY5uBCtqDf1WgTsGk
@@ -138,17 +138,17 @@
<RDF:li>
<RDF:Description>
<em:version>2.0</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
</RDF:Seq>
</em:updates>
<em:signature>MIGTMA0GCSqGSIb3DQEBBQUAA4GBAMH/33P/bn148mVkAB8i5X8c4LhY52E+MPUT
yKHGpowZnRLgL2O0dfpm+rljOBfKi51322PFrsc6VIFml6x4Lrb5foxSyB0Vs9pb
@@ -164,17 +164,17 @@
<RDF:li>
<RDF:Description>
<em:version>2.0</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
<em:updateHash>sha1:78fc1d2887eda35b4ad2e3a0b60120ca271ce6e6</em:updateHash>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
</RDF:Seq>
</em:updates>
<em:signature>MIGTMA0GCSqGSIb3DQEBBQUAA4GBAJ5Dv3Zd7/j5dLchCw9iO/cxPq8oOhOYD2M+
@@ -191,17 +191,17 @@
<RDF:li>
<RDF:Description>
<em:version>2.0</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
- <em:updateLink>https://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>https://example.com/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
</RDF:Seq>
</em:updates>
<em:signature>MIGTMA0GCSqGSIb3DQEBBQUAA4GBAGvf7XqqoTl5WofrNq55E7W+UttOEDXLB3Oi
XDiXe0i6njlozilseaUo1hgfQhhzN9gkyetP5tGBVcLRrVyliKpJmD6ABCVGW1lS
@@ -217,17 +217,17 @@
<RDF:li>
<RDF:Description>
<em:version>2.0</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
- <em:updateLink>https://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>https://example.com/broken.xpi</em:updateLink>
<em:updateHash>sha1:78fc1d2887eda35b4ad2e3a0b60120ca271ce6e6</em:updateHash>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
</RDF:Seq>
</em:updates>
<em:signature>MIGTMA0GCSqGSIb3DQEBBQUAA4GBACMX/KReOGSJ8CMGRroH1v3Gjv/Qs/pqH+Ow
@@ -244,17 +244,17 @@
<RDF:li>
<RDF:Description>
<em:version>2.0</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
- <em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>http://example.com/broken.xpi</em:updateLink>
<em:updateHash>md2:78fc1d2887eda35b4ad2e3a0b60120ca271ce6e6</em:updateHash>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
</RDF:Seq>
</em:updates>
<em:signature>MIGTMA0GCSqGSIb3DQEBBQUAA4GBAJRfcFvHIWxVyycCw8IjNmEhabc2uqA1zQwp
@@ -271,17 +271,17 @@
<RDF:li>
<RDF:Description>
<em:version>2.0</em:version>
<em:targetApplication>
<RDF:Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
- <em:updateLink>https://localhost:4444/broken.xpi</em:updateLink>
+ <em:updateLink>https://example.com/broken.xpi</em:updateLink>
<em:updateHash>md2:78fc1d2887eda35b4ad2e3a0b60120ca271ce6e6</em:updateHash>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
</RDF:li>
</RDF:Seq>
</em:updates>
<em:signature>MIGTMA0GCSqGSIb3DQEBBQUAA4GBALQKwzLFr/VOw3gJvv/LCh3/PWDd9FqmFnX+
@@ -304,44 +304,44 @@
<li>
<Description>
<em:version>1.0</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>0.1</em:minVersion>
<em:maxVersion>0.2</em:maxVersion>
- <em:updateLink>https://localhost:4444/addons/test1.xpi</em:updateLink>
+ <em:updateLink>https://example.com/addons/test1.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
</li>
<li>
<Description>
<em:version>2.0</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>0.5</em:minVersion>
<em:maxVersion>0.6</em:maxVersion>
- <em:updateLink>https://localhost:4444/addons/test2.xpi</em:updateLink>
+ <em:updateLink>https://example.com/addons/test2.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
</li>
<!-- Update for future app versions - should never be compatible -->
<li>
<Description>
<em:version>3.0</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>2</em:minVersion>
<em:maxVersion>3</em:maxVersion>
- <em:updateLink>https://localhost:4444/addons/test3.xpi</em:updateLink>
+ <em:updateLink>https://example.com/addons/test3.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
</li>
</Seq>
</em:updates>
</Description>
@@ -353,45 +353,45 @@
<li>
<Description>
<em:version>1.0</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>0.1</em:minVersion>
<em:maxVersion>0.2</em:maxVersion>
- <em:updateLink>https://localhost:4444/addons/test1.xpi</em:updateLink>
+ <em:updateLink>https://example.com/addons/test1.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
</li>
<!-- Has compatibility override, so is incompaible -->
<li>
<Description>
<em:version>2.0</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>0.5</em:minVersion>
<em:maxVersion>0.6</em:maxVersion>
- <em:updateLink>https://localhost:4444/addons/test2.xpi</em:updateLink>
+ <em:updateLink>https://example.com/addons/test2.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
</li>
<!-- Update for future app versions - should never be compatible -->
<li>
<Description>
<em:version>3.0</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>2</em:minVersion>
<em:maxVersion>3</em:maxVersion>
- <em:updateLink>https://localhost:4444/addons/test3.xpi</em:updateLink>
+ <em:updateLink>https://example.com/addons/test3.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
</li>
</Seq>
</em:updates>
</Description>
@@ -403,17 +403,17 @@
<Description>
<em:version>1.0</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>0.1</em:minVersion>
<em:maxVersion>0.2</em:maxVersion>
<em:strictCompatibility>true</em:strictCompatibility>
- <em:updateLink>https://localhost:4444/addons/test1.xpi</em:updateLink>
+ <em:updateLink>https://example.com/addons/test1.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
</li>
</Seq>
</em:updates>
</Description>
</RDF>
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_updateid.rdf
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/test_updateid.rdf
@@ -9,17 +9,17 @@
<li>
<Description>
<em:version>2.0</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
- <em:updateLink>http://localhost:4444/addons/test_updateid2.xpi</em:updateLink>
+ <em:updateLink>http://example.com/addons/test_updateid2.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
</li>
</Seq>
</em:updates>
</Description>
--- a/toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository_cache.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository_cache.js
@@ -3,18 +3,18 @@
*/
// Tests caching in AddonRepository.jsm
ChromeUtils.import("resource://gre/modules/addons/AddonRepository.jsm");
var gServer;
-const PORT = 4444;
-const BASE_URL = "http://localhost:" + PORT;
+const HOST = "example.com";
+const BASE_URL = "http://example.com";
const PREF_GETADDONS_CACHE_ENABLED = "extensions.getAddons.cache.enabled";
const PREF_GETADDONS_CACHE_TYPES = "extensions.getAddons.cache.types";
const GETADDONS_RESULTS = BASE_URL + "/data/test_AddonRepository_cache.json";
const COMPAT_RESULTS = BASE_URL + "/data/test_AddonRepository_cache_compat.json";
const EMPTY_RESULT = BASE_URL + "/data/test_AddonRepository_empty.json";
const FAILED_RESULT = BASE_URL + "/data/test_AddonRepository_fail.json";
@@ -434,17 +434,17 @@ add_task(async function setup() {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9");
startupManager();
// Install XPI add-ons
await promiseInstallAllFiles(ADDON_FILES);
await promiseRestartManager();
- gServer = createHttpServer(PORT);
+ gServer = AddonTestUtils.createHttpServer({hosts: [HOST]});
gServer.registerDirectory("/data/", do_get_file("data"));
});
// Tests AddonRepository.cacheEnabled
add_task(async function run_test_1() {
Services.prefs.setBoolPref(PREF_GETADDONS_CACHE_ENABLED, false);
Assert.ok(!AddonRepository.cacheEnabled);
Services.prefs.setBoolPref(PREF_GETADDONS_CACHE_ENABLED, true);
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug299716.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug299716.js
@@ -21,17 +21,16 @@ const checkListener = {
onUpdateFinished: function onUpdateFinished() {
if (--this.pendingCount == 0)
next_test();
}
};
// Get the HTTP server.
-ChromeUtils.import("resource://testing-common/httpd.js");
var testserver;
var ADDONS = [
// XPCShell
{
id: "bug299716-a@tests.mozilla.org",
addon: "test_bug299716_a_1",
installed: true,
@@ -122,28 +121,27 @@ function run_test() {
const addonsDir = do_get_addon(ADDONS[0].addon).parent;
// Make sure we can actually get our data files.
const xpiFile = addonsDir.clone();
xpiFile.append("test_bug299716_a_2.xpi");
Assert.ok(xpiFile.exists());
// Create and configure the HTTP server.
- testserver = new HttpServer();
+ testserver = AddonTestUtils.createHttpServer({hosts: ["example.com"]});
testserver.registerDirectory("/addons/", addonsDir);
testserver.registerDirectory("/data/", dataDir);
- testserver.start(4444);
// Make sure we can fetch the files over HTTP.
const xhr = new XMLHttpRequest();
- xhr.open("GET", "http://localhost:4444/addons/test_bug299716_a_2.xpi", false);
+ xhr.open("GET", "http://example.com/addons/test_bug299716_a_2.xpi", false);
xhr.send(null);
Assert.ok(xhr.status == 200);
- xhr.open("GET", "http://localhost:4444/data/test_bug299716.rdf", false);
+ xhr.open("GET", "http://example.com/data/test_bug299716.rdf", false);
xhr.send(null);
Assert.ok(xhr.status == 200);
// Start the real test.
startupManager();
dump("\n\n*** INSTALLING NEW ITEMS\n\n");
installAllFiles(ADDONS.map(a => do_get_addon(a.addon)), run_test_pt2,
@@ -196,11 +194,11 @@ function run_test_pt4() {
dump("\n\n*** FINAL CHECKS\n\n");
AddonManager.getAddonsByIDs(ADDONS.map(a => a.id), function(items) {
for (var i = 0; i < ADDONS.length; i++) {
var item = items[i];
do_check_item(item, "0.2", ADDONS[i]);
}
- testserver.stop(do_test_finished);
+ do_test_finished();
});
}
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug299716_2.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug299716_2.js
@@ -1,50 +1,46 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
// Disables security checking our updates which haven't been signed
Services.prefs.setBoolPref("extensions.checkUpdateSecurity", false);
-// Get the HTTP server.
-ChromeUtils.import("resource://testing-common/httpd.js");
var testserver;
var ADDON = {
id: "bug299716-2@tests.mozilla.org",
addon: "test_bug299716_2"
};
function run_test() {
do_test_pending();
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2", "1.9");
const dataDir = do_get_file("data");
const addonsDir = do_get_addon(ADDON.addon).parent;
// Create and configure the HTTP server.
- testserver = new HttpServer();
+ testserver = AddonTestUtils.createHttpServer({hosts: ["example.com"]});
testserver.registerDirectory("/addons/", addonsDir);
testserver.registerDirectory("/data/", dataDir);
- testserver.start(4444);
startupManager();
installAllFiles([do_get_addon(ADDON.addon)], function() {
restartManager();
AddonManager.getAddonByID(ADDON.id, function(item) {
Assert.equal(item.version, 0.1);
Assert.ok(!item.isCompatible);
item.findUpdates({
onUpdateFinished(addon) {
Assert.ok(!item.isCompatible);
-
- testserver.stop(do_test_finished);
+ do_test_finished();
}
}, AddonManager.UPDATE_WHEN_USER_REQUESTED);
});
});
}
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug324121.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug324121.js
@@ -1,18 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
// Disables security checking our updates which haven't been signed
Services.prefs.setBoolPref("extensions.checkUpdateSecurity", false);
-// Get the HTTP server.
-ChromeUtils.import("resource://testing-common/httpd.js");
var testserver;
var gItemsNotChecked = [];
var ADDONS = [ {id: "bug324121_1@tests.mozilla.org",
addon: "test_bug324121_1",
shouldCheck: false },
{id: "bug324121_2@tests.mozilla.org",
@@ -124,19 +122,18 @@ var updateListener = {
function run_test() {
do_test_pending();
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2", "2");
const dataDir = do_get_file("data");
// Create and configure the HTTP server.
- testserver = new HttpServer();
+ testserver = AddonTestUtils.createHttpServer({hosts: ["example.com"]});
testserver.registerDirectory("/data/", dataDir);
- testserver.start(4444);
startupManager();
installAllFiles(ADDONS.map(a => do_get_addon(a.addon)), function() {
restartManager();
AddonManager.getAddonByID(ADDONS[0].id, callback_soon(function(firstAddon) {
Assert.ok(firstAddon);
firstAddon.userDisabled = true;
@@ -166,10 +163,10 @@ function run_test() {
}
});
}));
});
}
function test_complete() {
Assert.equal(gItemsNotChecked.length, 0);
- testserver.stop(do_test_finished);
+ do_test_finished();
}
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug335238.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug335238.js
@@ -1,17 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
// Disables security checking our updates which haven't been signed
Services.prefs.setBoolPref("extensions.checkUpdateSecurity", false);
-ChromeUtils.import("resource://testing-common/httpd.js");
ChromeUtils.import("resource://testing-common/MockRegistrar.jsm");
// This is the data we expect to see sent as part of the update url.
var EXPECTED = [
{
id: "bug335238_1@tests.mozilla.org",
version: "1.3.4",
maxAppVersion: "5",
@@ -119,17 +118,17 @@ var updateListener = {
pendingCount: 0,
onUpdateAvailable(aAddon) {
do_throw("Should not have seen an update for " + aAddon.id);
},
onUpdateFinished() {
if (--this.pendingCount == 0)
- server.stop(do_test_finished);
+ do_test_finished();
}
};
var requestHandler = {
handle(metadata, response) {
var expected = EXPECTED[metadata.path.substring(1)];
var params = metadata.queryString.split("&");
Assert.equal(params.length, 10);
@@ -142,22 +141,21 @@ var requestHandler = {
response.setStatusLine(metadata.httpVersion, 404, "Not Found");
}
};
function run_test() {
do_test_pending();
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9");
- server = new HttpServer();
+ server = AddonTestUtils.createHttpServer({hosts: ["example.com"]});
server.registerPathHandler("/0", requestHandler);
server.registerPathHandler("/1", requestHandler);
server.registerPathHandler("/2", requestHandler);
server.registerPathHandler("/3", requestHandler);
- server.start(4444);
Services.locale.setRequestedLocales(["en-US"]);
startupManager();
installAllFiles(ADDONS.map(a => do_get_addon(a.addon)), function() {
restartManager();
AddonManager.getAddonByID(ADDONS[1].id, callback_soon(function(addon) {
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug394300.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug394300.js
@@ -1,34 +1,33 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
// Disables security checking our updates which haven't been signed
Services.prefs.setBoolPref("extensions.checkUpdateSecurity", false);
-ChromeUtils.import("resource://testing-common/httpd.js");
var server;
// nsIAddonUpdateCheckListener implementation
var updateListener = {
_count: 0,
onUpdateAvailable: function onAddonUpdateEnded(aAddon, aInstall) {
Assert.equal(aInstall.version, 10);
},
onNoUpdateAvailable: function onNoUpdateAvailable(aAddon) {
do_throw("Expected an available update for " + aAddon.id);
},
onUpdateFinished: function onUpdateFinished() {
if (++this._count == 2)
- server.stop(do_test_finished);
+ do_test_finished();
},
};
function run_test() {
// Setup for test
do_test_pending();
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9");
startupManager();
@@ -39,17 +38,16 @@ function run_test() {
restartManager();
AddonManager.getAddonsByIDs(["bug394300_1@tests.mozilla.org",
"bug394300_2@tests.mozilla.org"], function(updates) {
Assert.notEqual(updates[0], null);
Assert.notEqual(updates[1], null);
- server = new HttpServer();
+ server = AddonTestUtils.createHttpServer({hosts: ["example.com"]});
server.registerDirectory("/", do_get_file("data"));
- server.start(4444);
updates[0].findUpdates(updateListener, AddonManager.UPDATE_WHEN_USER_REQUESTED);
updates[1].findUpdates(updateListener, AddonManager.UPDATE_WHEN_USER_REQUESTED);
});
});
}
--- a/toolkit/mozapps/extensions/test/xpcshell/test_install_strictcompat.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_install_strictcompat.js
@@ -27,32 +27,31 @@ function run_test() {
startupManager();
// Make sure we only register once despite multiple calls
AddonManager.addInstallListener(InstallListener);
AddonManager.addAddonListener(AddonListener);
AddonManager.addInstallListener(InstallListener);
AddonManager.addAddonListener(AddonListener);
// Create and configure the HTTP server.
- testserver = new HttpServer();
+ testserver = AddonTestUtils.createHttpServer({hosts: ["example.com"]});
testserver.registerDirectory("/addons/", do_get_file("addons"));
testserver.registerDirectory("/data/", do_get_file("data"));
testserver.registerPathHandler("/redirect", function(aRequest, aResponse) {
aResponse.setStatusLine(null, 301, "Moved Permanently");
let url = aRequest.host + ":" + aRequest.port + aRequest.queryString;
aResponse.setHeader("Location", "http://" + url);
});
- testserver.start(4444);
do_test_pending();
run_test_1();
}
function end_test() {
- testserver.stop(do_test_finished);
+ do_test_finished();
}
// Checks that an install from a local file proceeds as expected
function run_test_1() {
prepare_test({ }, [
"onNewInstall"
]);
@@ -183,17 +182,17 @@ function check_test_1() {
}
// Tests that an install from a url downloads.
function run_test_2(aAddon) {
let { id, version } = aAddon;
restartManager();
do_check_not_in_crash_annotation(id, version);
- let url = "http://localhost:4444/addons/test_install2_1.xpi";
+ let url = "http://example.com/addons/test_install2_1.xpi";
AddonManager.getInstallForURL(url, function(install) {
Assert.notEqual(install, null);
Assert.equal(install.version, "1.0");
Assert.equal(install.name, "Test 2");
Assert.equal(install.state, AddonManager.STATE_AVAILABLE);
Assert.equal(install.iconURL, null);
Assert.equal(install.sourceURI.spec, url);
@@ -266,17 +265,17 @@ function check_test_3(aInstall) {
Assert.notEqual(a2, null);
Assert.equal(a2.type, "extension");
Assert.equal(a2.version, "2.0");
Assert.equal(a2.name, "Real Test 2");
Assert.ok(isExtensionInAddonsList(profileDir, a2.id));
Assert.ok(do_get_addon("test_install2_1").exists());
do_check_in_crash_annotation(a2.id, a2.version);
Assert.equal(a2.sourceURI.spec,
- "http://localhost:4444/addons/test_install2_1.xpi");
+ "http://example.com/addons/test_install2_1.xpi");
let difference = a2.installDate.getTime() - updateDate;
if (Math.abs(difference) > MAX_TIME_DIFFERENCE)
do_throw("Add-on install time was out by " + difference + "ms");
difference = a2.updateDate.getTime() - updateDate;
if (Math.abs(difference) > MAX_TIME_DIFFERENCE)
do_throw("Add-on update time was out by " + difference + "ms");
@@ -290,17 +289,17 @@ function check_test_3(aInstall) {
}
// Tests that installing a new version of an existing add-on works
function run_test_4() {
prepare_test({ }, [
"onNewInstall"
]);
- let url = "http://localhost:4444/addons/test_install2_2.xpi";
+ let url = "http://example.com/addons/test_install2_2.xpi";
AddonManager.getInstallForURL(url, function(install) {
ensure_test_completed();
Assert.notEqual(install, null);
Assert.equal(install.version, "3.0");
Assert.equal(install.name, "Test 3");
Assert.equal(install.state, AddonManager.STATE_AVAILABLE);
@@ -368,17 +367,17 @@ function check_test_5(install) {
Assert.equal(a2.type, "extension");
Assert.equal(a2.version, "3.0");
Assert.equal(a2.name, "Real Test 3");
Assert.ok(a2.isActive);
Assert.ok(isExtensionInAddonsList(profileDir, a2.id));
Assert.ok(do_get_addon("test_install2_2").exists());
do_check_in_crash_annotation(a2.id, a2.version);
Assert.equal(a2.sourceURI.spec,
- "http://localhost:4444/addons/test_install2_2.xpi");
+ "http://example.com/addons/test_install2_2.xpi");
Assert.equal(a2.installDate.getTime(), gInstallDate);
// Update date should be later (or the same if this test is too fast)
Assert.ok(a2.installDate <= a2.updateDate);
a2.uninstall();
executeSoon(run_test_6);
});
@@ -390,17 +389,17 @@ function check_test_5(install) {
// Tests that an install that requires a compatibility update works
function run_test_6() {
restartManager();
prepare_test({ }, [
"onNewInstall"
]);
- let url = "http://localhost:4444/addons/test_install3.xpi";
+ let url = "http://example.com/addons/test_install3.xpi";
AddonManager.getInstallForURL(url, function(install) {
ensure_test_completed();
Assert.notEqual(install, null);
Assert.equal(install.version, "1.0");
Assert.equal(install.name, "Real Test 4");
Assert.equal(install.state, AddonManager.STATE_AVAILABLE);
@@ -510,17 +509,17 @@ async function check_test_8() {
// Test that after cancelling a download it is removed from the active installs
function run_test_9() {
restartManager();
prepare_test({ }, [
"onNewInstall"
]);
- let url = "http://localhost:4444/addons/test_install3.xpi";
+ let url = "http://example.com/addons/test_install3.xpi";
AddonManager.getInstallForURL(url, function(install) {
ensure_test_completed();
Assert.notEqual(install, null);
Assert.equal(install.version, "1.0");
Assert.equal(install.name, "Real Test 4");
Assert.equal(install.state, AddonManager.STATE_AVAILABLE);
@@ -559,17 +558,17 @@ function check_test_9(install) {
// Tests that after cancelling a pending install it is removed from the active
// installs
function run_test_10() {
prepare_test({ }, [
"onNewInstall"
]);
- let url = "http://localhost:4444/addons/test_install3.xpi";
+ let url = "http://example.com/addons/test_install3.xpi";
AddonManager.getInstallForURL(url, function(install) {
ensure_test_completed();
Assert.notEqual(install, null);
Assert.equal(install.version, "1.0");
Assert.equal(install.name, "Real Test 4");
Assert.equal(install.state, AddonManager.STATE_AVAILABLE);
@@ -633,17 +632,17 @@ function run_test_13() {
installAllFiles([do_get_addon("test_install2_1")], function() {
restartManager();
prepare_test({ }, [
"onNewInstall"
]);
- let url = "http://localhost:4444/addons/test_install2_2.xpi";
+ let url = "http://example.com/addons/test_install2_2.xpi";
AddonManager.getInstallForURL(url, function(install) {
ensure_test_completed();
Assert.notEqual(install, null);
Assert.equal(install.version, "3.0");
Assert.equal(install.name, "Test 3");
Assert.equal(install.state, AddonManager.STATE_AVAILABLE);
@@ -717,17 +716,17 @@ function check_test_13(install) {
// Check that cancelling the install from onDownloadStarted actually cancels it
function run_test_14() {
restartManager();
prepare_test({ }, [
"onNewInstall"
]);
- let url = "http://localhost:4444/addons/test_install2_1.xpi";
+ let url = "http://example.com/addons/test_install2_1.xpi";
AddonManager.getInstallForURL(url, function(install) {
ensure_test_completed();
Assert.equal(install.file, null);
prepare_test({ }, [
"onDownloadStarted"
], check_test_14);
@@ -767,17 +766,17 @@ function check_test_14(install) {
}
// Checks that cancelling the install from onDownloadEnded actually cancels it
function run_test_15() {
prepare_test({ }, [
"onNewInstall"
]);
- let url = "http://localhost:4444/addons/test_install2_1.xpi";
+ let url = "http://example.com/addons/test_install2_1.xpi";
AddonManager.getInstallForURL(url, function(install) {
ensure_test_completed();
Assert.equal(install.file, null);
prepare_test({ }, [
"onDownloadStarted",
"onDownloadEnded"
@@ -804,33 +803,33 @@ function check_test_15(install) {
// Allow the listener to return to see if it starts installing
executeSoon(run_test_16);
}
// Verify that the userDisabled value carries over to the upgrade by default
function run_test_16() {
restartManager();
- let url = "http://localhost:4444/addons/test_install2_1.xpi";
+ let url = "http://example.com/addons/test_install2_1.xpi";
AddonManager.getInstallForURL(url, function(aInstall) {
aInstall.addListener({
onInstallStarted() {
Assert.ok(!aInstall.addon.userDisabled);
aInstall.addon.userDisabled = true;
},
onInstallEnded() {
executeSoon(function test16_install1() {
restartManager();
AddonManager.getAddonByID("addon2@tests.mozilla.org", function(a2) {
Assert.ok(a2.userDisabled);
Assert.ok(!a2.isActive);
- let url_2 = "http://localhost:4444/addons/test_install2_2.xpi";
+ let url_2 = "http://example.com/addons/test_install2_2.xpi";
AddonManager.getInstallForURL(url_2, function(aInstall_2) {
aInstall_2.addListener({
onInstallEnded() {
executeSoon(function test16_install2() {
Assert.ok(aInstall_2.addon.userDisabled);
restartManager();
@@ -853,30 +852,30 @@ function run_test_16() {
aInstall.install();
}, "application/x-xpinstall");
}
// Verify that changing the userDisabled value before onInstallEnded works
function run_test_17() {
restartManager();
- let url = "http://localhost:4444/addons/test_install2_1.xpi";
+ let url = "http://example.com/addons/test_install2_1.xpi";
AddonManager.getInstallForURL(url, function(aInstall) {
aInstall.addListener({
onInstallEnded() {
executeSoon(function() {
Assert.ok(!aInstall.addon.userDisabled);
restartManager();
AddonManager.getAddonByID("addon2@tests.mozilla.org", function(a2) {
Assert.ok(!a2.userDisabled);
Assert.ok(a2.isActive);
- let url_2 = "http://localhost:4444/addons/test_install2_2.xpi";
+ let url_2 = "http://example.com/addons/test_install2_2.xpi";
AddonManager.getInstallForURL(url_2, function(aInstall_2) {
aInstall_2.addListener({
onInstallStarted() {
Assert.ok(!aInstall_2.addon.userDisabled);
aInstall_2.addon.userDisabled = true;
},
onInstallEnded() {
@@ -902,33 +901,33 @@ function run_test_17() {
aInstall.install();
}, "application/x-xpinstall");
}
// Verify that changing the userDisabled value before onInstallEnded works
function run_test_18() {
restartManager();
- let url = "http://localhost:4444/addons/test_install2_1.xpi";
+ let url = "http://example.com/addons/test_install2_1.xpi";
AddonManager.getInstallForURL(url, function(aInstall) {
aInstall.addListener({
onInstallStarted() {
Assert.ok(!aInstall.addon.userDisabled);
aInstall.addon.userDisabled = true;
},
onInstallEnded() {
executeSoon(function test18_install1() {
restartManager();
AddonManager.getAddonByID("addon2@tests.mozilla.org", function(a2) {
Assert.ok(a2.userDisabled);
Assert.ok(!a2.isActive);
- let url_2 = "http://localhost:4444/addons/test_install2_2.xpi";
+ let url_2 = "http://example.com/addons/test_install2_2.xpi";
AddonManager.getInstallForURL(url_2, function(aInstall_2) {
aInstall_2.addListener({
onInstallStarted() {
Assert.ok(aInstall_2.addon.userDisabled);
aInstall_2.addon.userDisabled = false;
},
onInstallEnded() {
@@ -957,23 +956,23 @@ function run_test_18() {
// Checks that metadata is not stored if the pref is set to false
function run_test_18_1() {
restartManager();
Services.prefs.setBoolPref("extensions.getAddons.cache.enabled", true);
Services.prefs.setCharPref(PREF_GETADDONS_BYIDS,
- "http://localhost:4444/data/test_install_addons.json");
+ "http://example.com/data/test_install_addons.json");
Services.prefs.setCharPref(PREF_COMPAT_OVERRIDES,
- "http://localhost:4444/data/test_install_compat.json");
+ "http://example.com/data/test_install_compat.json");
Services.prefs.setBoolPref("extensions.addon2@tests.mozilla.org.getAddons.cache.enabled", false);
- let url = "http://localhost:4444/addons/test_install2_1.xpi";
+ let url = "http://example.com/addons/test_install2_1.xpi";
AddonManager.getInstallForURL(url, function(aInstall) {
aInstall.addListener({
onInstallEnded(unused, aAddon) {
executeSoon(function test18_install() {
Assert.notEqual(aAddon.fullDescription, "Repository description");
restartManager();
@@ -991,17 +990,17 @@ function run_test_18_1() {
}
// Checks that metadata is downloaded for new installs and is visible before and
// after restart
function run_test_19() {
restartManager();
Services.prefs.setBoolPref("extensions.addon2@tests.mozilla.org.getAddons.cache.enabled", true);
- let url = "http://localhost:4444/addons/test_install2_1.xpi";
+ let url = "http://example.com/addons/test_install2_1.xpi";
AddonManager.getInstallForURL(url, function(aInstall) {
aInstall.addListener({
onInstallEnded(unused, aAddon) {
executeSoon(function test19_install() {
Assert.equal(aAddon.fullDescription, "Repository description");
restartManager();
@@ -1017,17 +1016,17 @@ function run_test_19() {
aInstall.install();
}, "application/x-xpinstall");
}
// Do the same again to make sure it works when the data is already in the cache
function run_test_20() {
restartManager();
- let url = "http://localhost:4444/addons/test_install2_1.xpi";
+ let url = "http://example.com/addons/test_install2_1.xpi";
AddonManager.getInstallForURL(url, function(aInstall) {
aInstall.addListener({
onInstallEnded(unused, aAddon) {
executeSoon(function test20_install() {
Assert.equal(aAddon.fullDescription, "Repository description");
restartManager();
@@ -1063,17 +1062,17 @@ function run_test_21() {
"onNewInstall",
"onDownloadStarted",
"onDownloadEnded",
"onInstallStarted",
"onInstallCancelled",
"onInstallEnded",
], check_test_21);
- let url = "http://localhost:4444/addons/test_install2_1.xpi";
+ let url = "http://example.com/addons/test_install2_1.xpi";
AddonManager.getInstallForURL(url, function(aInstall) {
aInstall.install();
}, "application/x-xpinstall");
});
});
}
function check_test_21(aInstall) {
@@ -1104,17 +1103,17 @@ function check_test_21(aInstall) {
}
// Tests that an install can be restarted after being cancelled
function run_test_22() {
prepare_test({ }, [
"onNewInstall"
]);
- let url = "http://localhost:4444/addons/test_install3.xpi";
+ let url = "http://example.com/addons/test_install3.xpi";
AddonManager.getInstallForURL(url, function(aInstall) {
ensure_test_completed();
Assert.notEqual(aInstall, null);
Assert.equal(aInstall.state, AddonManager.STATE_AVAILABLE);
prepare_test({}, [
"onDownloadStarted",
@@ -1165,17 +1164,17 @@ function finish_test_22(aInstall) {
// Tests that an install can be restarted after being cancelled when a hash
// was provided
function run_test_23() {
prepare_test({ }, [
"onNewInstall"
]);
- let url = "http://localhost:4444/addons/test_install3.xpi";
+ let url = "http://example.com/addons/test_install3.xpi";
AddonManager.getInstallForURL(url, function(aInstall) {
ensure_test_completed();
Assert.notEqual(aInstall, null);
Assert.equal(aInstall.state, AddonManager.STATE_AVAILABLE);
prepare_test({}, [
"onDownloadStarted",
@@ -1226,17 +1225,17 @@ function finish_test_23(aInstall) {
// Tests that an install with a bad hash can be restarted after it fails, though
// it will only fail again
function run_test_24() {
prepare_test({ }, [
"onNewInstall"
]);
- let url = "http://localhost:4444/addons/test_install3.xpi";
+ let url = "http://example.com/addons/test_install3.xpi";
AddonManager.getInstallForURL(url, function(aInstall) {
ensure_test_completed();
Assert.notEqual(aInstall, null);
Assert.equal(aInstall.state, AddonManager.STATE_AVAILABLE);
prepare_test({}, [
"onDownloadStarted",
@@ -1290,31 +1289,31 @@ function run_test_26() {
let observerService = AM_Cc["@mozilla.org/network/http-activity-distributor;1"].
getService(AM_Ci.nsIHttpActivityDistributor);
observerService.addObserver({
observeActivity(aChannel, aType, aSubtype, aTimestamp, aSizeData,
aStringData) {
aChannel.QueryInterface(AM_Ci.nsIChannel);
// Wait for the final event for the redirected URL
- if (aChannel.URI.spec != "http://localhost:4444/addons/test_install1.xpi" ||
+ if (aChannel.URI.spec != "http://example.com/addons/test_install1.xpi" ||
aType != AM_Ci.nsIHttpActivityObserver.ACTIVITY_TYPE_HTTP_TRANSACTION ||
aSubtype != AM_Ci.nsIHttpActivityObserver.ACTIVITY_SUBTYPE_TRANSACTION_CLOSE)
return;
// Request should have been cancelled
Assert.equal(aChannel.status, Cr.NS_BINDING_ABORTED);
observerService.removeObserver(this);
run_test_27();
}
});
- let url = "http://localhost:4444/redirect?/addons/test_install1.xpi";
+ let url = "http://example.com/redirect?/addons/test_install1.xpi";
AddonManager.getInstallForURL(url, function(aInstall) {
aInstall.addListener({
onDownloadProgress(aDownloadProgressInstall) {
aDownloadProgressInstall.cancel();
}
});
aInstall.install();
@@ -1324,17 +1323,17 @@ function run_test_26() {
// Tests that an install can be restarted during onDownloadCancelled after being
// cancelled in mid-download
function run_test_27() {
prepare_test({ }, [
"onNewInstall"
]);
- let url = "http://localhost:4444/addons/test_install3.xpi";
+ let url = "http://example.com/addons/test_install3.xpi";
AddonManager.getInstallForURL(url, function(aInstall) {
ensure_test_completed();
Assert.notEqual(aInstall, null);
Assert.equal(aInstall.state, AddonManager.STATE_AVAILABLE);
aInstall.addListener({
onDownloadProgress() {
--- a/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck.js
@@ -3,22 +3,23 @@
*/
// This verifies that AddonUpdateChecker works correctly
ChromeUtils.import("resource://gre/modules/addons/AddonUpdateChecker.jsm");
ChromeUtils.import("resource://testing-common/httpd.js");
-var testserver = createHttpServer(4444);
+var testserver = AddonTestUtils.createHttpServer({hosts: ["example.com"]});
+
testserver.registerDirectory("/data/", do_get_file("data"));
function checkUpdates(aId, aUpdateFile) {
return new Promise((resolve, reject) => {
- AddonUpdateChecker.checkForUpdates(aId, `http://localhost:4444/data/${aUpdateFile}`, {
+ AddonUpdateChecker.checkForUpdates(aId, `http://example.com/data/${aUpdateFile}`, {
onUpdateCheckComplete: resolve,
onUpdateCheckError(status) {
let error = new Error("Update check failed with status " + status);
error.status = status;
reject(error);
}
});
--- a/toolkit/mozapps/extensions/test/xpcshell/test_updateid.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_updateid.js
@@ -26,17 +26,17 @@ function promiseInstallUpdate(install) {
onInstallEnded: resolve,
});
install.install();
});
}
// Create and configure the HTTP server.
-let testserver = createHttpServer(4444);
+let testserver = AddonTestUtils.createHttpServer({hosts: ["example.com"]});
testserver.registerDirectory("/data/", do_get_file("data"));
testserver.registerDirectory("/addons/", do_get_file("addons"));
function run_test() {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
startupManager();
run_next_test();
}
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -66,17 +66,16 @@ tags = webextensions
[test_reload.js]
# Bug 676992: test consistently hangs on Android
# There's a problem removing a temp file without manually clearing the cache on Windows
skip-if = os == "android" || os == "win"
tags = webextensions
[test_AddonRepository_cache.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"
-run-sequentially = Uses hardcoded ports in xpi files.
[test_AddonRepository_paging.js]
[test_LightweightThemeManager.js]
[test_backgroundupdate.js]
[test_bad_json.js]
[test_badschema.js]
[test_blocklistchange.js]
# Times out during parallel runs on desktop
requesttimeoutfactor = 2
@@ -92,46 +91,41 @@ skip-if = os == "android"
tags = blocklist
[test_bootstrap.js]
skip-if = true # Bug 1358846 Bug 1365021 Bug 676992
[test_bootstrap_const.js]
[test_bootstrap_resource.js]
[test_bug299716.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"
-run-sequentially = Uses hardcoded ports in xpi files.
[test_bug299716_2.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"
-run-sequentially = Hardcoded port in install.rdf.
[test_bug324121.js]
# Bug 676992: test consistently hangs on Android
# Bug 1026805: frequent hangs on OSX 10.8
skip-if = os == "android" || os == "mac"
-run-sequentially = Uses hardcoded ports in xpi files.
[test_bug335238.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"
-run-sequentially = Uses hardcoded ports in xpi files.
tags = blocklist
[test_bug371495.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"
[test_bug384052.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"
[test_bug393285.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"
tags = blocklist
[test_bug394300.js]
# Bug 676992: test consistently hangs on Android
# Bug 1026805: frequent hangs on OSX 10.8
skip-if = os == "android" || os == "mac"
-run-sequentially = Uses hardcoded ports in xpi files.
[test_bug397778.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"
[test_bug406118.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"
tags = blocklist
[test_bug425657.js]
@@ -272,17 +266,16 @@ skip-if = true
tags = blocklist
[test_install.js]
[test_install_icons.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"
[test_install_strictcompat.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"
-run-sequentially = Uses hardcoded ports in xpi files.
[test_isDebuggable.js]
[test_legacy.js]
skip-if = !allow_legacy_extensions || appname == "thunderbird"
[test_locale.js]
[test_locked.js]
[test_locked2.js]
[test_locked_strictcompat.js]
[test_manifest.js]
@@ -336,24 +329,22 @@ tags = webextensions
[test_update_strictcompat.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"
[test_update_ignorecompat.js]
skip-if = true # Bug 676922 Bug 1437697
[test_updatecheck.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"
-run-sequentially = Uses hardcoded ports in xpi files.
[test_json_updatecheck.js]
[test_migrate_state_prefs.js]
[test_seen.js]
[test_updateid.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"
-run-sequentially = Uses hardcoded ports in xpi files.
[test_update_compatmode.js]
[test_upgrade.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"
run-sequentially = Uses global XCurProcD dir.
[test_upgrade_strictcompat.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"