Issue 4223 - Adapt synchronizer tests to work in adblockpluscore repository

test/synchronizer.js

Index: test/synchronizer.js
===================================================================
--- a/test/synchronizer.js
+++ b/test/synchronizer.js
@@ -1,524 +1,848 @@
-(function()
-{
-  let testRunner = null;
-  let requestHandlers = null;
-  let randomResult = 0.5;
-
-  module("Synchronizer", {
-    setup: function()
-    {
-      testRunner = this;
-
-      prepareFilterComponents.call(this);
-      preparePrefs.call(this);
+/*
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2016 Eyeo GmbH
+ *
+ * Adblock Plus is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Adblock Plus is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-      Synchronizer.init();
+"use strict";
 
-      setupVirtualTime.call(this, function(wrapTimer)
-      {
-        let SynchronizerModule = getModuleGlobal("synchronizer");
-        SynchronizerModule.downloader._timer = wrapTimer(SynchronizerModule.downloader._timer);
-      }, "synchronizer", "downloader");
-      setupVirtualXMLHttp.call(this, "synchronizer", "downloader");
+let {createSandbox} = require("./_common");
 
-      // Replace Math.random() function
-      let DownloaderGlobal = Cu.getGlobalForObject(getModuleGlobal("downloader"));
-      this._origRandom = DownloaderGlobal.Math.random;
-      DownloaderGlobal.Math.random = () => randomResult;
-      randomResult = 0.5;
+const MILLIS_IN_SECOND = 1000;
+const MILLIS_IN_MINUTE = 60 * MILLIS_IN_SECOND;
+const MILLIS_IN_HOUR = 60 * MILLIS_IN_MINUTE;
+const MILLIS_IN_DAY = 24 * MILLIS_IN_HOUR;
+
+const Cr = {
+  NS_OK: 0,
+  NS_BINDING_ABORTED: 0x804B0002,
+  NS_ERROR_FAILURE: 0x80004005
+}
+
+let Filter = null;
+let FilterStorage = null;
+let Prefs = null;
+let Subscription = null;
+let Synchronizer = null;
+
+exports.setUp = function(callback)
+{
+  let currentTime = 100000 * MILLIS_IN_HOUR;
+  let startTime = currentTime;
+
+  let fakeTimer = {
+    callback: null,
+    delay: -1,
+    nextExecution: 0,
+
+    initWithCallback: function(callback, delay, type)
+    {
+      if (this.callback)
+        throw new Error("Only one timer instance supported");
+      if (type != 1)
+        throw new Error("Only TYPE_REPEATING_SLACK timers supported");
+
+      this.callback = callback;
+      this.delay = delay;
+      this.nextExecution = currentTime + delay;
     },
 
-    teardown: function()
+    trigger: function()
     {
-      restoreFilterComponents.call(this);
-      restorePrefs.call(this);
-      restoreVirtualTime.call(this);
-      restoreVirtualXMLHttp.call(this);
+      if (currentTime < this.nextExecution)
+        currentTime = this.nextExecution;
+      try
+      {
+        this.callback();
+      }
+      finally
+      {
+        this.nextExecution = currentTime + this.delay;
+      }
+    },
 
-      if (this._origRandom)
+    cancel: function()
+    {
+      this.nextExecution = -1;
+    }
+  };
+
+  let requests = [];
+  function XMLHttpRequest()

[kzar, 2016/10/05 11:36:51]

Seems kind of wasteful to define XMLHttpRequest and some of this other stuff
inside setUp for every test?

[Wladimir Palant, 2016/10/05 12:12:51]

Not really - we want a clean environment for every test. But the code is quite
massive and unstructured indeed, the next change is going to move it into
_common.js.

[kzar, 2016/10/05 12:18:16]

Fair enough.

+  {
+    this._host = "http://example.com";
+    this._loadHandlers = [];
+    this._errorHandlers = [];
+  };
+  XMLHttpRequest.prototype =
+  {
+    _path: null,
+    _data: null,
+    _queryString: null,
+    _loadHandlers: null,
+    _errorHandlers: null,
+    status: 0,
+    readyState: 0,
+    responseText: null,
+
+    addEventListener: function(eventName, handler, capture)
+    {
+      let list;
+      if (eventName == "load")
+        list = this._loadHandlers;
+      else if (eventName == "error")
+        list = this._errorHandlers;
+      else
+        throw new Error("Event type " + eventName + " not supported");
+
+      if (list.indexOf(handler) < 0)
+        list.push(handler);
+    },
+
+    removeEventListener: function(eventName, handler, capture)
+    {
+      let list;
+      if (eventName == "load")
+        list = this._loadHandlers;
+      else if (eventName == "error")
+        list = this._errorHandlers;
+      else
+        throw new Error("Event type " + eventName + " not supported");
+
+      let index = list.indexOf(handler);
+      if (index >= 0)
+        list.splice(index, 1);
+    },
+
+    open: function(method, url, async, user, password)
+    {
+      if (method != "GET")
+        throw new Error("Only GET requests are supported");
+      if (typeof async != "undefined" && !async)
+        throw new Error("Sync requests are not supported");
+      if (typeof user != "undefined" || typeof password != "undefined")
+        throw new Error("User authentification is not supported");
+
+      let match = /^data:[^,]+,/.exec(url);
+      if (match)
       {
-        let DownloaderGlobal = Cu.getGlobalForObject(getModuleGlobal("downloader"));
-        DownloaderGlobal.Math.random = this._origRandom;
-        delete this._origRandom;
+        this._data = decodeURIComponent(url.substr(match[0].length));
+        return;
       }
 
-      Synchronizer.init();
+      if (url.substr(0, this._host.length + 1) != this._host + "/")
+        throw new Error("Unexpected URL: " + url + " (URL starting with " + this._host + "expected)");
+
+      this._path = url.substr(this._host.length);
+
+      let queryIndex = this._path.indexOf("?");
+      this._queryString = "";
+      if (queryIndex >= 0)
+      {
+        this._queryString = this._path.substr(queryIndex + 1);
+        this._path = this._path.substr(0, queryIndex);
+      }
+    },
+
+    send: function(data)
+    {
+      if (!this._data && !this._path)
+        throw new Error("No request path set");
+      if (typeof data != "undefined" && data)
+        throw new Error("Sending data to server is not supported");
+
+      requests.push(Promise.resolve().then(() =>
+      {
+        let result = [Cr.NS_OK, 404, ""];
+        if (this._data)
+          result = [Cr.NS_OK, 0, this._data];
+        else if (this._path in XMLHttpRequest.requestHandlers)
+        {
+          result = XMLHttpRequest.requestHandlers[this._path]({
+            method: "GET",
+            path: this._path,
+            queryString: this._queryString
+          });
+        }
+
+        [this.channel.status, this.channel.responseStatus, this.responseText] = result;
+        this.status = this.channel.responseStatus;
+
+        let eventName = (this.channel.status == Cr.NS_OK ? "load" : "error");
+        let event = {type: eventName};
+        for (let handler of this["_" + eventName + "Handlers"])
+          handler.call(this, event);
+      }));
+    },
+
+    overrideMimeType: function(mime)
+    {
+    },
+
+    channel:
+    {
+      status: -1,
+      responseStatus: 0,
+      loadFlags: 0,
+      INHIBIT_CACHING: 0,
+      VALIDATE_ALWAYS: 0,
+      QueryInterface: () => this
+    }
+  };
+
+  XMLHttpRequest.requestHandlers = {};
+  this.registerHandler = (path, handler) =>
+  {
+    XMLHttpRequest.requestHandlers[path] = handler;
+  };
+
+  function waitForRequests()
+  {
+    if (requests.length)
+    {
+      let result = Promise.all(requests);
+      requests = [];
+      return result.catch(e =>
+      {
+        console.error(e);
+      }).then(() => waitForRequests());
+    }
+    else
+      return Promise.resolve();
+  }
+
+  function runScheduledTasks(maxMillis)
+  {
+    let endTime = currentTime + maxMillis;
+    if (fakeTimer.nextExecution < 0 || fakeTimer.nextExecution > endTime)
+    {
+      currentTime = endTime;
+      return Promise.resolve();
+    }
+    else
+    {
+      fakeTimer.trigger();
+      return waitForRequests().then(() => runScheduledTasks(endTime - currentTime));
+    }
+
+    currentTime = endTime;
+  }
+
+  this.runScheduledTasks = (maxHours, initial, skip) =>
+  {
+    if (typeof maxHours != "number")
+      throw new Error("Numerical parameter expected");
+    if (typeof initial != "number")
+      initial = 0;
+    if (typeof skip != "number")
+      skip = 0;
+
+    startTime = currentTime;
+    return Promise.resolve().then(() =>
+    {
+      if (initial >= 0)
+      {
+        maxHours -= initial;
+        return runScheduledTasks(initial * MILLIS_IN_HOUR);
+      }
+    }).then(() =>
+    {
+      if (skip >= 0)
+      {
+        maxHours -= skip;
+        currentTime += skip * MILLIS_IN_HOUR;
+      }
+      return runScheduledTasks(maxHours * MILLIS_IN_HOUR);
+    });
+  };
+
+  this.getTimeOffset = () => (currentTime - startTime) / MILLIS_IN_HOUR;
+  Object.defineProperty(this, "currentTime", {
+    get: () => currentTime
+  });
+
+  let randomResult = 0.5;
+  Object.defineProperty(this, "randomResult", {
+    get: () => randomResult,
+    set: value => randomResult = value
+  });
+
+  let sandboxedRequire = createSandbox({
+    globals: {
+      Cc: {
+        "@mozilla.org/timer;1": {
+          createInstance: () => fakeTimer
+        }
+      },
+      Ci: {
+        nsITimer:
+        {
+          TYPE_ONE_SHOT: 0,
+          TYPE_REPEATING_SLACK: 1,
+          TYPE_REPEATING_PRECISE: 2
+        },
+        nsIHttpChannel: () => null,
+      },
+      Cr: Cr,
+      XMLHttpRequest: XMLHttpRequest,
+      Date: {
+        now: () => currentTime
+      },
+      Math: {
+        random: () => randomResult,
+        min: Math.min,
+        max: Math.max,
+        round: Math.round
+      },
+      URL: function(urlString)
+      {
+        return require("url").parse(urlString);
+      }
     }
   });
 
-  function resetSubscription(subscription)
-  {
-    FilterStorage.updateSubscriptionFilters(subscription, []);
-    subscription.lastCheck =  subscription.lastDownload =
-      subscription.version = subscription.lastSuccess =
-      subscription.expires = subscription.softExpiration = 0;
-    subscription.title = "";
-    subscription.homepage = null;
-    subscription.errors = 0;
-    subscription.downloadStatus = null;
-    subscription.requiredVersion = null;
-  }
+  (
+    {Filter} = sandboxedRequire("../lib/filterClasses"),
+    {FilterStorage} = sandboxedRequire("../lib/filterStorage"),
+    {Prefs} = sandboxedRequire("./stub-modules/prefs"),
+    {Subscription} = sandboxedRequire("../lib/subscriptionClasses"),
+    {Synchronizer} = sandboxedRequire("../lib/synchronizer")
+  );
 
-  let initialDelay = 1 / 60;
-
-  test("Downloads of one subscription", function()
-  {
-    let subscription = Subscription.fromURL("http://example.com/subscription");
-    FilterStorage.addSubscription(subscription);
+  callback();
+};
 
-    let requests = [];
-    testRunner.registerHandler("/subscription", function(metadata)
-    {
-      requests.push([testRunner.getTimeOffset(), metadata.method, metadata.path]);
-      return [Cr.NS_OK, 200, "[Adblock]\n! ExPiREs: 1day\nfoo\nbar"];
-    });
+function unexpectedError(error)
+{
+  console.error(error);
+  this.ok(false, "Unexpected error: " + error);
+}
 
-    testRunner.runScheduledTasks(50);
-    deepEqual(requests, [
+function resetSubscription(subscription)
+{
+  FilterStorage.updateSubscriptionFilters(subscription, []);
+  subscription.lastCheck =  subscription.lastDownload =
+    subscription.version = subscription.lastSuccess =
+    subscription.expires = subscription.softExpiration = 0;
+  subscription.title = "";
+  subscription.homepage = null;
+  subscription.errors = 0;
+  subscription.downloadStatus = null;
+  subscription.requiredVersion = null;
+}
+
+let initialDelay = 1 / 60;
+
+exports.testOneSubscriptionDownloads = function(test)
+{
+  let subscription = Subscription.fromURL("http://example.com/subscription");
+  FilterStorage.addSubscription(subscription);
+
+  let requests = [];
+  this.registerHandler("/subscription", metadata =>

[kzar, 2016/10/05 11:36:51]

I guess we could avoid declaring all the module variables at the top like `let
Filter = null;` too if we assigned them to the `this` Object from the setUp
functions. I didn't realise that was an option before, not sure if it's worth
changing that everywhere now however.

[Wladimir Palant, 2016/10/05 12:12:51]

Not during the initial migration - the fewer changes the better. But we should
definitely consider better options that avoid having global variables.

+  {
+    requests.push([this.getTimeOffset(), metadata.method, metadata.path]);
+    return [Cr.NS_OK, 200, "[Adblock]\n! ExPiREs: 1day\nfoo\nbar"];
+  });
+
+  this.runScheduledTasks(50).then(() =>
+  {
+    test.deepEqual(requests, [
       [0 + initialDelay, "GET", "/subscription"],
       [24 + initialDelay, "GET", "/subscription"],
       [48 + initialDelay, "GET", "/subscription"],
     ], "Requests after 50 hours");
-  });
-
-  test("Downloads of two subscriptions", function()
-  {
-    let subscription1 = Subscription.fromURL("http://example.com/subscription1");
-    FilterStorage.addSubscription(subscription1);
+  }).catch(unexpectedError.bind(test)).then(() => test.done());
+};
 
-    let subscription2 = Subscription.fromURL("http://example.com/subscription2");
-    subscription2.expires =
-      subscription2.softExpiration =
-      (testRunner.currentTime + 2 * MILLIS_IN_HOUR) / MILLIS_IN_SECOND;
-    FilterStorage.addSubscription(subscription2);
+exports.testTwoSubscriptionsDownloads = function(test)
+{
+  let subscription1 = Subscription.fromURL("http://example.com/subscription1");
+  FilterStorage.addSubscription(subscription1);
 
-    let requests = [];
-    function handler(metadata)
-    {
-      requests.push([testRunner.getTimeOffset(), metadata.method, metadata.path]);
-      return [Cr.NS_OK, 200, "[Adblock]\n! ExPiREs: 1day\nfoo\nbar"];
-    }
+  let subscription2 = Subscription.fromURL("http://example.com/subscription2");
+  subscription2.expires =
+    subscription2.softExpiration =
+    (this.currentTime + 2 * MILLIS_IN_HOUR) / MILLIS_IN_SECOND;
+  FilterStorage.addSubscription(subscription2);
 
-    testRunner.registerHandler("/subscription1", handler);
-    testRunner.registerHandler("/subscription2", handler);
+  let requests = [];
+  let handler = metadata =>
+  {
+    requests.push([this.getTimeOffset(), metadata.method, metadata.path]);
+    return [Cr.NS_OK, 200, "[Adblock]\n! ExPiREs: 1day\nfoo\nbar"];
+  };
 
-    testRunner.runScheduledTasks(55);
-    deepEqual(requests, [
+  this.registerHandler("/subscription1", handler);
+  this.registerHandler("/subscription2", handler);
+
+  this.runScheduledTasks(55).then(() =>
+  {
+    test.deepEqual(requests, [
       [0 + initialDelay, "GET", "/subscription1"],
       [2 + initialDelay, "GET", "/subscription2"],
       [24 + initialDelay, "GET", "/subscription1"],
       [26 + initialDelay, "GET", "/subscription2"],
       [48 + initialDelay, "GET", "/subscription1"],
       [50 + initialDelay, "GET", "/subscription2"],
     ], "Requests after 55 hours");
-  });
-
-  test("Download result, various subscription headers", function()
-  {
-    let test;
-    let subscription = Subscription.fromURL("http://example.com/subscription");
-    FilterStorage.addSubscription(subscription);
-
-    testRunner.registerHandler("/subscription", function(metadata)
-    {
-      return [Cr.NS_OK, 200, test.header + "\n!Expires: 8 hours\nfoo\n!bar\n\n@@bas\n#bam"];
-    });
-
-    let tests = [
-      {header: "[Adblock]", downloadStatus: "synchronize_ok", requiredVersion: null},
-      {header: "[Adblock Plus]", downloadStatus: "synchronize_ok", requiredVersion: null},
-      {header: "(something)[Adblock]", downloadStatus: "synchronize_ok", requiredVersion: null},
-      {header: "[Adblock Plus 0.0.1]", downloadStatus: "synchronize_ok", requiredVersion: "0.0.1"},
-      {header: "[Adblock Plus 99.9]", downloadStatus: "synchronize_ok", requiredVersion: "99.9"},
-      {header: "[Foo]", downloadStatus: "synchronize_invalid_data", requiredVersion: null}
-    ];
-    for (test of tests)
-    {
-      resetSubscription(subscription)
-      testRunner.runScheduledTasks(2);
-
-      equal(subscription.downloadStatus, test.downloadStatus, "Download status for " + test.header)
-      equal(subscription.requiredVersion, test.requiredVersion, "Required version for " + test.header)
+  }).catch(unexpectedError.bind(test)).then(() => test.done());
+};
 
-      if (test.downloadStatus == "synchronize_ok")
-      {
-        deepEqual(subscription.filters, [
-          Filter.fromText("foo"),
-          Filter.fromText("!bar"),
-          Filter.fromText("@@bas"),
-          Filter.fromText("#bam"),
-        ], "Resulting subscription filters for " + test.header);
-      }
-      else
-      {
-        deepEqual(subscription.filters, [
-        ], "Resulting subscription filters for " + test.header);
-      }
-    }
-  })
+exports.testSubscriptionHeaders = {};
 
-  test("Automatic updates disabled", function()
-  {
-    Prefs.subscriptions_autoupdate = false;
-
-    let subscription = Subscription.fromURL("http://example.com/subscription");
-    FilterStorage.addSubscription(subscription);
-
-    let requests = 0;
-    testRunner.registerHandler("/subscription", function(metadata)
-    {
-      requests++;
-      throw new Error("Unexpected request");
-    });
-
-    testRunner.runScheduledTasks(50);
-    equal(requests, 0, "Request count");
-  });
-
-  test("Expiration time", function()
+for (let currentTest of [
+  {header: "[Adblock]", downloadStatus: "synchronize_ok", requiredVersion: null},
+  {header: "[Adblock Plus]", downloadStatus: "synchronize_ok", requiredVersion: null},
+  {header: "(something)[Adblock]", downloadStatus: "synchronize_ok", requiredVersion: null},
+  {header: "[Adblock Plus 0.0.1]", downloadStatus: "synchronize_ok", requiredVersion: "0.0.1"},
+  {header: "[Adblock Plus 99.9]", downloadStatus: "synchronize_ok", requiredVersion: "99.9"},
+  {header: "[Foo]", downloadStatus: "synchronize_invalid_data", requiredVersion: null}
+])
+{
+  exports.testSubscriptionHeaders[currentTest.header] = function(test)
   {
     let subscription = Subscription.fromURL("http://example.com/subscription");
     FilterStorage.addSubscription(subscription);
 
-    let test;
-    let requests = [];
-    testRunner.registerHandler("/subscription", function(metadata)
+    this.registerHandler("/subscription", metadata =>
     {
-      requests.push(testRunner.getTimeOffset());
-      return [Cr.NS_OK, 200, "[Adblock]\nfoo\n!Expires: " + test.expiration + "\nbar"];
+      return [Cr.NS_OK, 200, currentTest.header + "\n!Expires: 8 hours\nfoo\n!bar\n\n@@bas\n#bam"];
     });
 
-    let tests = [
-      {
-        expiration: "default",
-        randomResult: 0.5,
-        requests: [0 + initialDelay, 5 * 24 +  initialDelay]
-      },
-      {
-        expiration: "1 hours",  // Minimal expiration interval
-        randomResult: 0.5,
-        requests: [0 + initialDelay, 1 + initialDelay, 2 + initialDelay, 3 + initialDelay]
-      },
-      {
-        expiration: "26 hours",
-        randomResult: 0.5,
-        requests: [0 + initialDelay, 26 + initialDelay]
-      },
-      {
-        expiration: "2 days",
-        randomResult: 0.5,
-        requests: [0 + initialDelay, 48 + initialDelay]
-      },
-      {
-        expiration: "20 days",  // Too large, will be corrected
-        randomResult: 0.5,
-        requests: [0 + initialDelay, 14 * 24 + initialDelay]
-      },
-      {
-        expiration: "35 hours",
-        randomResult: 0,        // Changes interval by factor 0.8
-        requests: [0 + initialDelay, 28 + initialDelay]
-      },
-      {
-        expiration: "35 hours",
-        randomResult: 1,        // Changes interval by factor 1.2
-        requests: [0 + initialDelay, 42 + initialDelay]
-      },
+    this.runScheduledTasks(2).then(() =>
+    {
+      test.equal(subscription.downloadStatus, currentTest.downloadStatus, "Download status");
+      test.equal(subscription.requiredVersion, currentTest.requiredVersion, "Required version");
+
+      if (currentTest.downloadStatus == "synchronize_ok")
       {
-        expiration: "35 hours",
-        randomResult: 0.25,     // Changes interval by factor 0.9
-        requests: [0 + initialDelay, 32 + initialDelay]
-      },
-      {
-        expiration: "40 hours",
-        randomResult: 0.5,
-        skipAfter: 5 + initialDelay,
-        skip: 10,               // Short break should not increase soft expiration
-        requests: [0 + initialDelay, 40 + initialDelay]
-      },
-      {
-        expiration: "40 hours",
-        randomResult: 0.5,
-        skipAfter: 5 + initialDelay,
-        skip: 30,               // Long break should increase soft expiration
-        requests: [0 + initialDelay, 70 + initialDelay]
-      },
+        test.deepEqual(subscription.filters, [
+          Filter.fromText("foo"),
+          Filter.fromText("!bar"),
+          Filter.fromText("@@bas"),
+          Filter.fromText("#bam"),
+        ], "Resulting subscription filters");
+      }
+      else
       {
-        expiration: "40 hours",
-        randomResult: 0.5,
-        skipAfter: 5 + initialDelay,
-        skip: 80,               // Hitting hard expiration, immediate download
-        requests: [0 + initialDelay, 85 + initialDelay]
+        test.deepEqual(subscription.filters, [
+        ], "Resulting subscription filters");
       }
-    ]
+    }).catch(unexpectedError.bind(test)).then(() => test.done());
+  };
+}
 
-    for (test of tests)
-    {
-      requests = [];
-      randomResult = test.randomResult;
-      resetSubscription(subscription);
+exports.testsDisabledUpdates  = function(test)
+{
+  Prefs.subscriptions_autoupdate = false;
 
-      let maxHours = Math.round(Math.max.apply(null, test.requests)) + 1;
-      testRunner.runScheduledTasks(maxHours, test.skipAfter, test.skip);
+  let subscription = Subscription.fromURL("http://example.com/subscription");
+  FilterStorage.addSubscription(subscription);
 
-      let randomAddendum = (randomResult == 0.5 ? "" : " with Math.random() returning " + randomResult);
-      let skipAddendum = (typeof test.skip != "number" ? "" : " skipping " + test.skip + " hours after " + test.skipAfter + " hours");
-      deepEqual(requests, test.requests, "Requests for \"" + test.expiration + "\"" + randomAddendum + skipAddendum);
-    }
+  let requests = 0;
+  this.registerHandler("/subscription", metadata =>
+  {
+    requests++;
+    throw new Error("Unexpected request");
   });
 
-  test("Checksum verification", function()
+  this.runScheduledTasks(50).then(() =>
+  {
+    test.equal(requests, 0, "Request count");
+  }).catch(unexpectedError.bind(test)).then(() => test.done());
+};
+
+exports.testExpirationTime = {};
+
+for (let currentTest of [
+  {
+    expiration: "default",
+    randomResult: 0.5,
+    requests: [0 + initialDelay, 5 * 24 +  initialDelay]
+  },
+  {
+    expiration: "1 hours",  // Minimal expiration interval
+    randomResult: 0.5,
+    requests: [0 + initialDelay, 1 + initialDelay, 2 + initialDelay, 3 + initialDelay]
+  },
+  {
+    expiration: "26 hours",
+    randomResult: 0.5,
+    requests: [0 + initialDelay, 26 + initialDelay]
+  },
+  {
+    expiration: "2 days",
+    randomResult: 0.5,
+    requests: [0 + initialDelay, 48 + initialDelay]
+  },
+  {
+    expiration: "20 days",  // Too large, will be corrected
+    randomResult: 0.5,
+    requests: [0 + initialDelay, 14 * 24 + initialDelay]
+  },
+  {
+    expiration: "35 hours",
+    randomResult: 0,        // Changes interval by factor 0.8
+    requests: [0 + initialDelay, 28 + initialDelay]
+  },
+  {
+    expiration: "35 hours",
+    randomResult: 1,        // Changes interval by factor 1.2
+    requests: [0 + initialDelay, 42 + initialDelay]
+  },
+  {
+    expiration: "35 hours",
+    randomResult: 0.25,     // Changes interval by factor 0.9
+    requests: [0 + initialDelay, 32 + initialDelay]
+  },
+  {
+    expiration: "40 hours",
+    randomResult: 0.5,
+    skipAfter: 5 + initialDelay,
+    skip: 10,               // Short break should not increase soft expiration
+    requests: [0 + initialDelay, 40 + initialDelay]
+  },
+  {
+    expiration: "40 hours",
+    randomResult: 0.5,
+    skipAfter: 5 + initialDelay,
+    skip: 30,               // Long break should increase soft expiration
+    requests: [0 + initialDelay, 70 + initialDelay]
+  },
+  {
+    expiration: "40 hours",
+    randomResult: 0.5,
+    skipAfter: 5 + initialDelay,
+    skip: 80,               // Hitting hard expiration, immediate download
+    requests: [0 + initialDelay, 85 + initialDelay]
+  }
+])
+{
+  let testId = `"${currentTest.expiration}"`;
+  if (currentTest.randomResult != 0.5)
+    testId += " with Math.random() returning " + currentTest.randomResult;
+  if (currentTest.skip)
+    testId += " skipping " + currentTest.skip + " hours after " + currentTest.skipAfter + " hours";
+  exports.testExpirationTime[testId] = function(test)
   {
     let subscription = Subscription.fromURL("http://example.com/subscription");
     FilterStorage.addSubscription(subscription);
 
-    let testName, subscriptionBody, expectedResult;
-    let tests = [
-      ["Correct checksum", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\nfoo\nbar\n", true],
-      ["Wrong checksum", "[Adblock]\n! Checksum: wrongggny6Fn24b7JHsq/A\nfoo\nbar\n", false],
-      ["Empty lines ignored", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\n\nfoo\n\nbar\n\n", true],
-      ["CR LF line breaks treated like LR", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\nfoo\r\nbar\r\n", true],
-      ["CR line breaks treated like LR", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\nfoo\rbar\r", true],
-      ["Trailing line break not ignored", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\nfoo\nbar", false],
-      ["Line breaks between lines not ignored", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\nfoobar", false],
-      ["Lines with spaces not ignored", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\n \nfoo\n\nbar\n", false],
-      ["Extra content in checksum line is part of the checksum", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A foobar\nfoo\nbar\n", false],
-      ["= symbols after checksum are ignored", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A===\nfoo\nbar\n", true],
-      ["Header line is part of the checksum", "[Adblock Plus]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\nfoo\nbar\n", false],
-      ["Special comments are part of the checksum", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\n! Expires: 1\nfoo\nbar\n", false],
-    ];
-
-    testRunner.registerHandler("/subscription", function(metadata)
+    let requests = [];
+    this.registerHandler("/subscription", metadata =>
     {
-      return [Cr.NS_OK, 200, subscriptionBody];
+      requests.push(this.getTimeOffset());
+      return [Cr.NS_OK, 200, "[Adblock]\nfoo\n!Expires: " + currentTest.expiration + "\nbar"];
     });
 
-    for ([testName, subscriptionBody, expectedResult] of tests)
+    this.randomResult = currentTest.randomResult;
+
+    let maxHours = Math.round(Math.max.apply(null, currentTest.requests)) + 1;
+    this.runScheduledTasks(maxHours, currentTest.skipAfter, currentTest.skip).then(() =>
     {
-      resetSubscription(subscription);
-      testRunner.runScheduledTasks(2);
-      equal(subscription.downloadStatus, expectedResult ? "synchronize_ok" : "synchronize_checksum_mismatch", testName);
-    }
-  });
+      test.deepEqual(requests, currentTest.requests, "Requests");
+    }).catch(unexpectedError.bind(test)).then(() => test.done());
+  };
+}
 
-  test("Special comments", function()
+exports.testChecksumVerification = {};
+
+for (let [testName, subscriptionBody, expectedResult] of [
+  ["Correct checksum", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\nfoo\nbar\n", true],
+  ["Wrong checksum", "[Adblock]\n! Checksum: wrongggny6Fn24b7JHsq/A\nfoo\nbar\n", false],
+  ["Empty lines ignored", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\n\nfoo\n\nbar\n\n", true],
+  ["CR LF line breaks treated like LR", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\nfoo\r\nbar\r\n", true],
+  ["CR line breaks treated like LR", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\nfoo\rbar\r", true],
+  ["Trailing line break not ignored", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\nfoo\nbar", false],
+  ["Line breaks between lines not ignored", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\nfoobar", false],
+  ["Lines with spaces not ignored", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\n \nfoo\n\nbar\n", false],
+  ["Extra content in checksum line is part of the checksum", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A foobar\nfoo\nbar\n", false],
+  ["= symbols after checksum are ignored", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A===\nfoo\nbar\n", true],
+  ["Header line is part of the checksum", "[Adblock Plus]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\nfoo\nbar\n", false],
+  ["Special comments are part of the checksum", "[Adblock]\n! Checksum: e/JCmqXny6Fn24b7JHsq/A\n! Expires: 1\nfoo\nbar\n", false],
+])
+{
+  exports.testChecksumVerification[testName] = function(test)
   {
     let subscription = Subscription.fromURL("http://example.com/subscription");
     FilterStorage.addSubscription(subscription);
 
-    let comment, check;
-    let tests = [
-      ["! Homepage: http://example.com/", () => equal(subscription.homepage, "http://example.com/", "Valid homepage comment")],
-      ["! Homepage: ssh://example.com/", () => equal(subscription.homepage, null, "Invalid homepage comment")],
-      ["! Title: foo", function()
-        {
-          equal(subscription.title, "foo", "Title comment");
-          equal(subscription.fixedTitle, true, "Fixed title");
-        }],
-      ["! Version: 1234", () => equal(subscription.version, 1234, "Version comment")]
-    ];
+    this.registerHandler("/subscription", metadata =>
+    {
+      return [Cr.NS_OK, 200, subscriptionBody];
+    });
 
-    testRunner.registerHandler("/subscription", function(metadata)
+    this.runScheduledTasks(2).then(() =>
+    {
+      test.equal(subscription.downloadStatus, expectedResult ? "synchronize_ok" : "synchronize_checksum_mismatch");
+    }).catch(unexpectedError.bind(test)).then(() => test.done());
+  };
+}
+
+exports.testSpecialComments = {};
+
+for (let [comment, check] of [
+  ["! Homepage: http://example.com/", (test, subscription) =>
+  {
+    test.equal(subscription.homepage, "http://example.com/", "Valid homepage comment");
+  }],
+  ["! Homepage: ssh://example.com/", (test, subscription) =>
+  {
+    test.equal(subscription.homepage, null, "Invalid homepage comment");
+  }],
+  ["! Title: foo", (test, subscription) =>
+    {
+      test.equal(subscription.title, "foo", "Title comment");
+      test.equal(subscription.fixedTitle, true, "Fixed title");
+    }],
+  ["! Version: 1234", (test, subscription) =>
+  {
+    test.equal(subscription.version, 1234, "Version comment");
+  }]
+])
+{
+  exports.testSpecialComments[comment] = function(test)
+  {
+    let subscription = Subscription.fromURL("http://example.com/subscription");
+    FilterStorage.addSubscription(subscription);
+
+    this.registerHandler("/subscription", metadata =>
     {
       return [Cr.NS_OK, 200, "[Adblock]\n" + comment + "\nfoo\nbar"];
     });
 
-    for ([comment, check] of tests)
+    this.runScheduledTasks(2).then(() =>
     {
-      resetSubscription(subscription);
-      testRunner.runScheduledTasks(2);
-      check();
-      deepEqual(subscription.filters, [Filter.fromText("foo"), Filter.fromText("bar")], "Special comment not added to filters");
-    }
+      check(test, subscription);
+      test.deepEqual(subscription.filters, [Filter.fromText("foo"), Filter.fromText("bar")], "Special comment not added to filters");
+    }).catch(unexpectedError.bind(test)).then(() => test.done());
+  };
+}
+
+exports.testRedirects = function(test)
+{
+  let subscription = Subscription.fromURL("http://example.com/subscription");
+  FilterStorage.addSubscription(subscription);
+
+  this.registerHandler("/subscription", metadata =>
+  {
+    return [Cr.NS_OK, 200, "[Adblock]\nfoo\n!Redirect: http://example.com/redirected\nbar"];
   });
 
-  test("Redirects", function()
+  let requests;
+
+  this.runScheduledTasks(30).then(() =>
   {
-    let subscription = Subscription.fromURL("http://example.com/subscription");
-    FilterStorage.addSubscription(subscription);
+    test.equal(FilterStorage.subscriptions[0], subscription, "Invalid redirect ignored");
+    test.equal(subscription.downloadStatus, "synchronize_connection_error", "Connection error recorded");
+    test.equal(subscription.errors, 2, "Number of download errors");
 
-    testRunner.registerHandler("/subscription", function(metadata)
+    requests = [];
+
+    this.registerHandler("/redirected", metadata =>
     {
-      return [Cr.NS_OK, 200, "[Adblock]\nfoo\n!Redirect: http://example.com/redirected\nbar"];
-    });
-
-    testRunner.runScheduledTasks(30);
-    equal(FilterStorage.subscriptions[0], subscription, "Invalid redirect ignored");
-    equal(subscription.downloadStatus, "synchronize_connection_error", "Connection error recorded");
-    equal(subscription.errors, 2, "Number of download errors");
-
-    let requests = [];
-    testRunner.registerHandler("/redirected", function(metadata)
-    {
-      requests.push(testRunner.getTimeOffset());
+      requests.push(this.getTimeOffset());
       return [Cr.NS_OK, 200, "[Adblock]\nfoo\n! Expires: 8 hours\nbar"];
     });
 
     resetSubscription(subscription);
-    testRunner.runScheduledTasks(15);
-    equal(FilterStorage.subscriptions[0].url, "http://example.com/redirected", "Redirect followed");
-    deepEqual(requests, [0 + initialDelay, 8 + initialDelay], "Resulting requests");
+    return this.runScheduledTasks(15);
+  }).then(() =>
+  {
+    test.equal(FilterStorage.subscriptions[0].url, "http://example.com/redirected", "Redirect followed");
+    test.deepEqual(requests, [0 + initialDelay, 8 + initialDelay], "Resulting requests");
 
-    testRunner.registerHandler("/redirected", function(metadata)
+    this.registerHandler("/redirected", metadata =>
     {
       return [Cr.NS_OK, 200, "[Adblock]\nfoo\n!Redirect: http://example.com/subscription\nbar"];
     })
 
     subscription = Subscription.fromURL("http://example.com/subscription");
     resetSubscription(subscription);
     FilterStorage.removeSubscription(FilterStorage.subscriptions[0]);
     FilterStorage.addSubscription(subscription);
 
-    testRunner.runScheduledTasks(2);
-    equal(FilterStorage.subscriptions[0], subscription, "Redirect not followed on redirect loop");
-    equal(subscription.downloadStatus, "synchronize_connection_error", "Download status after redirect loop");
+    return this.runScheduledTasks(2);
+  }).then(() =>
+  {
+    test.equal(FilterStorage.subscriptions[0], subscription, "Redirect not followed on redirect loop");
+    test.equal(subscription.downloadStatus, "synchronize_connection_error", "Download status after redirect loop");
+  }).catch(unexpectedError.bind(test)).then(() => test.done());
+};
+
+exports.testFallback = function(test)
+{
+  Prefs.subscriptions_fallbackerrors = 3;
+  Prefs.subscriptions_fallbackurl = "http://example.com/fallback?%SUBSCRIPTION%&%CHANNELSTATUS%&%RESPONSESTATUS%";
+
+  let subscription = Subscription.fromURL("http://example.com/subscription");
+  FilterStorage.addSubscription(subscription);
+
+  // No valid response from fallback
+
+  let requests = [];
+  let fallbackParams;
+  let redirectedRequests;
+  this.registerHandler("/subscription", metadata =>
+  {
+    requests.push(this.getTimeOffset());
+    return [Cr.NS_OK, 404, ""];
   });
 
-  test("Fallback", function()
+  this.runScheduledTasks(100).then(() =>
   {
-    Prefs.subscriptions_fallbackerrors = 3;
-    Prefs.subscriptions_fallbackurl = "http://example.com/fallback?%SUBSCRIPTION%&%CHANNELSTATUS%&%RESPONSESTATUS%";
-
-    let subscription = Subscription.fromURL("http://example.com/subscription");
-    FilterStorage.addSubscription(subscription);
-
-    // No valid response from fallback
-
-    let requests = [];
-    testRunner.registerHandler("/subscription", function(metadata)
-    {
-      requests.push(testRunner.getTimeOffset());
-      return [Cr.NS_OK, 404, ""];
-    });
-
-    testRunner.runScheduledTasks(100);
-    deepEqual(requests, [0 + initialDelay, 24 + initialDelay, 48 + initialDelay, 72 + initialDelay, 96 + initialDelay], "Continue trying if the fallback doesn't respond");
+    test.deepEqual(requests, [0 + initialDelay, 24 + initialDelay, 48 + initialDelay, 72 + initialDelay, 96 + initialDelay], "Continue trying if the fallback doesn't respond");
 
     // Fallback giving "Gone" response
 
     resetSubscription(subscription);
     requests = [];
     fallbackParams = null;
-    testRunner.registerHandler("/fallback", function(metadata)
+    this.registerHandler("/fallback", metadata =>
     {
       fallbackParams = decodeURIComponent(metadata.queryString);
       return [Cr.NS_OK, 200, "410 Gone"];
     });
 
-    testRunner.runScheduledTasks(100);
-    deepEqual(requests, [0 + initialDelay, 24 + initialDelay, 48 + initialDelay], "Stop trying if the fallback responds with Gone");
-    equal(fallbackParams, "http://example.com/subscription&0&404", "Fallback arguments");
+    return this.runScheduledTasks(100);
+  }).then(() =>
+  {
+    test.deepEqual(requests, [0 + initialDelay, 24 + initialDelay, 48 + initialDelay], "Stop trying if the fallback responds with Gone");
+    test.equal(fallbackParams, "http://example.com/subscription&0&404", "Fallback arguments");
 
     // Fallback redirecting to a missing file
 
     subscription = Subscription.fromURL("http://example.com/subscription");
     resetSubscription(subscription);
     FilterStorage.removeSubscription(FilterStorage.subscriptions[0]);
     FilterStorage.addSubscription(subscription);
     requests = [];
 
-    testRunner.registerHandler("/fallback", function(metadata)
+    this.registerHandler("/fallback", metadata =>
     {
       return [Cr.NS_OK, 200, "301 http://example.com/redirected"];
     });
-    testRunner.runScheduledTasks(100);
-    equal(FilterStorage.subscriptions[0].url, "http://example.com/subscription", "Ignore invalid redirect from fallback");
-    deepEqual(requests, [0 + initialDelay, 24 + initialDelay, 48 + initialDelay, 72 + initialDelay, 96 + initialDelay], "Requests not affected by invalid redirect");
+    return this.runScheduledTasks(100);
+  }).then(() =>
+  {
+    test.equal(FilterStorage.subscriptions[0].url, "http://example.com/subscription", "Ignore invalid redirect from fallback");
+    test.deepEqual(requests, [0 + initialDelay, 24 + initialDelay, 48 + initialDelay, 72 + initialDelay, 96 + initialDelay], "Requests not affected by invalid redirect");
 
     // Fallback redirecting to an existing file
 
     resetSubscription(subscription);
     requests = [];
-    let redirectedRequests = [];
-    testRunner.registerHandler("/redirected", function(metadata)
+    redirectedRequests = [];
+    this.registerHandler("/redirected", metadata =>
     {
-      redirectedRequests.push(testRunner.getTimeOffset());
+      redirectedRequests.push(this.getTimeOffset());
       return [Cr.NS_OK, 200, "[Adblock]\n!Expires: 1day\nfoo\nbar"];
     });
 
-    testRunner.runScheduledTasks(100);
-    equal(FilterStorage.subscriptions[0].url, "http://example.com/redirected", "Valid redirect from fallback is followed");
-    deepEqual(requests, [0 + initialDelay, 24 + initialDelay, 48 + initialDelay], "Stop polling original URL after a valid redirect from fallback");
-    deepEqual(redirectedRequests, [48 + initialDelay, 72 + initialDelay, 96 + initialDelay], "Request new URL after a valid redirect from fallback");
+    return this.runScheduledTasks(100);
+  }).then(() =>
+  {
+    test.equal(FilterStorage.subscriptions[0].url, "http://example.com/redirected", "Valid redirect from fallback is followed");
+    test.deepEqual(requests, [0 + initialDelay, 24 + initialDelay, 48 + initialDelay], "Stop polling original URL after a valid redirect from fallback");
+    test.deepEqual(redirectedRequests, [48 + initialDelay, 72 + initialDelay, 96 + initialDelay], "Request new URL after a valid redirect from fallback");
 
     // Checksum mismatch
 
-    testRunner.registerHandler("/subscription", function(metadata)
+    this.registerHandler("/subscription", metadata =>
     {
       return [Cr.NS_OK, 200, "[Adblock]\n! Checksum: wrong\nfoo\nbar"];
     });
 
     subscription = Subscription.fromURL("http://example.com/subscription");
     resetSubscription(subscription);
     FilterStorage.removeSubscription(FilterStorage.subscriptions[0]);
     FilterStorage.addSubscription(subscription);
 
-    testRunner.runScheduledTasks(100);
-    equal(FilterStorage.subscriptions[0].url, "http://example.com/redirected", "Wrong checksum produces fallback request");
+    return this.runScheduledTasks(100);
+  }).then(() =>
+  {
+    test.equal(FilterStorage.subscriptions[0].url, "http://example.com/redirected", "Wrong checksum produces fallback request");
 
     // Redirect loop
 
-    testRunner.registerHandler("/subscription", function(metadata)
+    this.registerHandler("/subscription", metadata =>
     {
       return [Cr.NS_OK, 200, "[Adblock]\n! Redirect: http://example.com/subscription2"];
     });
-    testRunner.registerHandler("/subscription2", function(metadata, response)
+    this.registerHandler("/subscription2", metadata =>
     {
       return [Cr.NS_OK, 200, "[Adblock]\n! Redirect: http://example.com/subscription"];
     });
 
     subscription = Subscription.fromURL("http://example.com/subscription");
     resetSubscription(subscription);
     FilterStorage.removeSubscription(FilterStorage.subscriptions[0]);
     FilterStorage.addSubscription(subscription);
 
-    testRunner.runScheduledTasks(100);
-    equal(FilterStorage.subscriptions[0].url, "http://example.com/redirected", "Fallback can still redirect even after a redirect loop");
+    return this.runScheduledTasks(100);
+  }).then(() =>
+  {
+    test.equal(FilterStorage.subscriptions[0].url, "http://example.com/redirected", "Fallback can still redirect even after a redirect loop");
+  }).catch(unexpectedError.bind(test)).then(() => test.done());
+};
+
+exports.testStateFields = function(test)
+{
+  let subscription = Subscription.fromURL("http://example.com/subscription");
+  FilterStorage.addSubscription(subscription);
+
+  this.registerHandler("/subscription", metadata =>
+  {
+    return [Cr.NS_OK, 200, "[Adblock]\n! Expires: 2 hours\nfoo\nbar"];
   });
 
-  test("State fields", function()
+  let startTime = this.currentTime;
+  this.runScheduledTasks(2).then(() =>
   {
-    let subscription = Subscription.fromURL("http://example.com/subscription");
-    FilterStorage.addSubscription(subscription);
-
-    testRunner.registerHandler("/subscription", function(metadata)
-    {
-      return [Cr.NS_OK, 200, "[Adblock]\n! Expires: 2 hours\nfoo\nbar"];
-    });
+    test.equal(subscription.downloadStatus, "synchronize_ok", "downloadStatus after successful download");
+    test.equal(subscription.lastDownload * MILLIS_IN_SECOND, startTime +  initialDelay * MILLIS_IN_HOUR, "lastDownload after successful download");
+    test.equal(subscription.lastSuccess * MILLIS_IN_SECOND, startTime +  initialDelay * MILLIS_IN_HOUR, "lastSuccess after successful download");
+    test.equal(subscription.lastCheck * MILLIS_IN_SECOND, startTime + (1 +  initialDelay) * MILLIS_IN_HOUR, "lastCheck after successful download");
+    test.equal(subscription.errors, 0, "errors after successful download");
 
-    let startTime = testRunner.currentTime;
-    testRunner.runScheduledTasks(2);
-
-    equal(subscription.downloadStatus, "synchronize_ok", "downloadStatus after successful download");
-    equal(subscription.lastDownload * MILLIS_IN_SECOND, startTime +  initialDelay * MILLIS_IN_HOUR, "lastDownload after successful download");
-    equal(subscription.lastSuccess * MILLIS_IN_SECOND, startTime +  initialDelay * MILLIS_IN_HOUR, "lastSuccess after successful download");
-    equal(subscription.lastCheck * MILLIS_IN_SECOND, startTime + (1 +  initialDelay) * MILLIS_IN_HOUR, "lastCheck after successful download");
-    equal(subscription.errors, 0, "errors after successful download");
-
-    testRunner.registerHandler("/subscription", function(metadata)
+    this.registerHandler("/subscription", metadata =>
     {
       return [Cr.NS_ERROR_FAILURE, 0, ""];
     });
 
-    testRunner.runScheduledTasks(2);
+    return this.runScheduledTasks(2);
+  }).then(() =>
+  {
+    test.equal(subscription.downloadStatus, "synchronize_connection_error", "downloadStatus after connection error");
+    test.equal(subscription.lastDownload * MILLIS_IN_SECOND, startTime + (2 +  initialDelay) * MILLIS_IN_HOUR, "lastDownload after connection error");
+    test.equal(subscription.lastSuccess * MILLIS_IN_SECOND, startTime + initialDelay * MILLIS_IN_HOUR, "lastSuccess after connection error");
+    test.equal(subscription.lastCheck * MILLIS_IN_SECOND, startTime + (3 + initialDelay) * MILLIS_IN_HOUR, "lastCheck after connection error");
+    test.equal(subscription.errors, 1, "errors after connection error");
 
-    equal(subscription.downloadStatus, "synchronize_connection_error", "downloadStatus after connection error");
-    equal(subscription.lastDownload * MILLIS_IN_SECOND, startTime + (2 +  initialDelay) * MILLIS_IN_HOUR, "lastDownload after connection error");
-    equal(subscription.lastSuccess * MILLIS_IN_SECOND, startTime + initialDelay * MILLIS_IN_HOUR, "lastSuccess after connection error");
-    equal(subscription.lastCheck * MILLIS_IN_SECOND, startTime + (3 + initialDelay) * MILLIS_IN_HOUR, "lastCheck after connection error");
-    equal(subscription.errors, 1, "errors after connection error");
-
-    testRunner.registerHandler("/subscription", function(metadata)
+    this.registerHandler("/subscription", metadata =>
     {
       return [Cr.NS_OK, 404, ""];
     });
 
-    testRunner.runScheduledTasks(24);
-
-    equal(subscription.downloadStatus, "synchronize_connection_error", "downloadStatus after download error");
-    equal(subscription.lastDownload * MILLIS_IN_SECOND, startTime + (26 + initialDelay) * MILLIS_IN_HOUR, "lastDownload after download error");
-    equal(subscription.lastSuccess * MILLIS_IN_SECOND, startTime + initialDelay * MILLIS_IN_HOUR, "lastSuccess after download error");
-    equal(subscription.lastCheck * MILLIS_IN_SECOND, startTime + (27 + initialDelay) * MILLIS_IN_HOUR, "lastCheck after download error");
-    equal(subscription.errors, 2, "errors after download error");
-  });
-})();
+    return this.runScheduledTasks(24);
+  }).then(() =>
+  {
+    test.equal(subscription.downloadStatus, "synchronize_connection_error", "downloadStatus after download error");
+    test.equal(subscription.lastDownload * MILLIS_IN_SECOND, startTime + (26 + initialDelay) * MILLIS_IN_HOUR, "lastDownload after download error");
+    test.equal(subscription.lastSuccess * MILLIS_IN_SECOND, startTime + initialDelay * MILLIS_IN_HOUR, "lastSuccess after download error");
+    test.equal(subscription.lastCheck * MILLIS_IN_SECOND, startTime + (27 + initialDelay) * MILLIS_IN_HOUR, "lastCheck after download error");
+    test.equal(subscription.errors, 2, "errors after download error");
+  }).catch(unexpectedError.bind(test)).then(() => test.done());
+};