Bug 1257533 - Address MattN review draft
authorMathieu Leplatre <mathieu@mozilla.com>
Thu, 14 Apr 2016 16:28:22 +0200
changeset 350953 726d33f7368e9500d4028f783b33e351ce307795
parent 350952 fda4a51492a1628dbeda991ff189ec410b76b298
child 350958 8ea7d64aec0b2234b415b70c33a6e2988b234107
push id15453
push usermleplatre@mozilla.com
push dateThu, 14 Apr 2016 14:30:40 +0000
bugs1257533
milestone48.0a1
Bug 1257533 - Address MattN review MozReview-Commit-ID: 3zqOGmVROjc
services/common/kinto-updater.js
services/common/tests/unit/test_kinto_updater.js
--- a/services/common/kinto-updater.js
+++ b/services/common/kinto-updater.js
@@ -49,18 +49,17 @@ this.checkVersions = function() {
     }
 
     let response = yield fetch(changesEndpoint, {headers});
 
     let versionInfo;
     // No changes since last time. Go on with empty list of changes.
     if (response.status == 304) {
       versionInfo = {data: []};
-    }
-    else {
+    } else {
       versionInfo = yield response.json();
     }
 
     // If the server is failing, the JSON response might not contain the
     // expected data (e.g. error response - Bug 1259145)
     if (!versionInfo.hasOwnProperty("data")) {
       throw new Error("Polling for changes failed.");
     }
--- a/services/common/tests/unit/test_kinto_updater.js
+++ b/services/common/tests/unit/test_kinto_updater.js
@@ -103,24 +103,24 @@ add_task(function* test_check_maybeSync(
     response.setHeader("Date", (new Date(3000)).toUTCString());
     response.setHeader("Content-Type", "application/json; charset=UTF-8");
     response.write(JSON.stringify({
       code: 503,
       errno: 999,
       error: "Service Unavailable",
     }));
     response.setStatusLine(null, 503, "Service Unavailable");
+    response.finish();
   }
   server.registerPathHandler(changesPath, simulateErrorResponse);
   // checkVersions() fails with adequate error.
   let error;
   try {
     yield updater.checkVersions();
-  }
-  catch (e) {
+  } catch (e) {
     error = e;
   }
   do_check_eq(error.message, "Polling for changes failed.");
   // When an error occurs, last update was not overwritten (see Date header above).
   do_check_eq(Services.prefs.getIntPref(PREF_LAST_UPDATE), 2);
 });
 
 function run_test() {