1 files changed, 56 insertions, 37 deletions
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug570173.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug570173.js
index 2c87d8c79..70de3b426 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug570173.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug570173.js
@@ -7,6 +7,7 @@
 // The test extension uses an insecure update url.
 Services.prefs.setBoolPref("extensions.checkUpdateSecurity", false);
 
+Components.utils.import("resource://testing-common/httpd.js");
 var testserver;
 const profileDir = gProfD.clone();
 profileDir.append("extensions");
@@ -15,47 +16,65 @@ function run_test() {
   createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
 
   // Create and configure the HTTP server.
-  testserver = createHttpServer();
+  testserver = new HttpServer();
   testserver.registerDirectory("/data/", do_get_file("data"));
   testserver.registerDirectory("/addons/", do_get_file("addons"));
+  testserver.start(-1);
   gPort = testserver.identity.primaryPort;
 
-  run_next_test();
+  writeInstallRDFForExtension({
+    id: "addon1@tests.mozilla.org",
+    version: "1.0",
+    updateURL: "http://localhost:" + gPort + "/data/test_missing.rdf",
+    targetApplications: [{
+      id: "xpcshell@tests.mozilla.org",
+      minVersion: "1",
+      maxVersion: "1"
+    }],
+    name: "Test Addon 1",
+  }, profileDir);
+
+  startupManager();
+
+  do_test_pending();
+  run_test_1();
+}
+
+function end_test() {
+  testserver.stop(do_test_finished);
 }
 
 // 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();
-  }
-});
+function run_test_1() {
+  AddonManager.getAddonByID("addon1@tests.mozilla.org", function(a1) {
+    do_check_neq(a1, null);
+    do_check_eq(a1.version, "1.0");
+
+    let sawCompat = false;
+    let sawUpdate = false;
+    a1.findUpdates({
+      onNoCompatibilityUpdateAvailable: function(addon) {
+        sawCompat = true;
+      },
+
+      onCompatibilityUpdateAvailable: function(addon) {
+        do_throw("Should not have seen a compatibility update");
+      },
+
+      onNoUpdateAvailable: function(addon) {
+        sawUpdate = true;
+      },
+
+      onUpdateAvailable: function(addon, install) {
+        do_throw("Should not have seen an update");
+      },
+
+      onUpdateFinished: function(addon, error) {
+        do_check_true(sawCompat);
+        do_check_true(sawUpdate);
+        do_check_eq(error, AddonManager.UPDATE_STATUS_DOWNLOAD_ERROR);
+        end_test();
+      }
+    }, AddonManager.UPDATE_WHEN_USER_REQUESTED);
+  });
+}