Merge branch 'ext-work'

1 files changed, 61 insertions, 0 deletions

diff --git a/toolkit/mozapps/webextensions/test/xpcshell/test_bug570173.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug570173.js
new file mode 100644
index 000000000..2c87d8c79
--- /dev/null
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug570173.js
@@ -0,0 +1,61 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// This verifies that add-on update check failures are propogated correctly
+
+// The test extension uses an insecure update url.
+Services.prefs.setBoolPref("extensions.checkUpdateSecurity", false);
+
+var testserver;
+const profileDir = gProfD.clone();
+profileDir.append("extensions");
+
+function run_test() {
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
+
+  // Create and configure the HTTP server.
+  testserver = createHttpServer();
+  testserver.registerDirectory("/data/", do_get_file("data"));
+  testserver.registerDirectory("/addons/", do_get_file("addons"));
+  gPort = testserver.identity.primaryPort;
+
+  run_next_test();
+}
+
+// Verify that an update check returns the correct errors.
+add_task(function* () {
+  for (let manifestType of ["rdf", "json"]) {
+    writeInstallRDFForExtension({
+      id: "addon1@tests.mozilla.org",
+      version: "1.0",
+      updateURL: `http://localhost:${gPort}/data/test_missing.${manifestType}`,
+      targetApplications: [{
+        id: "xpcshell@tests.mozilla.org",
+        minVersion: "1",
+        maxVersion: "1"
+      }],
+      name: "Test Addon 1",
+      bootstrap: "true",
+    }, profileDir);
+
+    yield promiseRestartManager();
+
+    let addon = yield promiseAddonByID("addon1@tests.mozilla.org");
+
+    ok(addon);
+    ok(addon.updateURL.endsWith(manifestType));
+    equal(addon.version, "1.0");
+
+    // We're expecting an error, so resolve when the promise is rejected.
+    let update = yield promiseFindAddonUpdates(addon, AddonManager.UPDATE_WHEN_USER_REQUESTED)
+      .catch(Promise.resolve);
+
+    ok(!update.compatibilityUpdate, "not expecting a compatibility update");
+    ok(!update.updateAvailable, "not expecting a compatibility update");
+
+    equal(update.error, AddonManager.UPDATE_STATUS_DOWNLOAD_ERROR);
+
+    addon.uninstall();
+  }
+});