Bug 1261271 - Prevent test_blocklist_regexp.js permafailing when 48 reaches beta. r=mossop
authorMark Goodwin <mgoodwin@mozilla.com>
Wed, 13 Apr 2016 20:54:15 +0100
changeset 317131 dc04a988f404ecd6de40583e2a6814f4e9db79c8
parent 317130 d80d1bee4c357b4cdcd47b9866dece04e003553a
child 317132 e475e587c4488565896189f09739f37738cbfe24
push id9480
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 17:12:58 +0000
treeherdermozilla-aurora@0d6a91c76a9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmossop
bugs1261271
milestone48.0a1
Bug 1261271 - Prevent test_blocklist_regexp.js permafailing when 48 reaches beta. r=mossop MozReview-Commit-ID: 62zsxvFIrK2
toolkit/mozapps/extensions/test/xpcshell/test_blocklist_regexp.js
--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_regexp.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_regexp.js
@@ -59,18 +59,22 @@ function load_blocklist(aFile, aCallback
 
     do_execute_soon(aCallback);
   }, "blocklist-updated", false);
 
   Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:" +
                              gPort + "/data/" + aFile);
   var blocklist = Cc["@mozilla.org/extensions/blocklist;1"].
                   getService(Ci.nsITimerCallback);
-  ok(Services.prefs.getBoolPref("services.kinto.update_enabled", false),
-                                "Kinto update should be enabled");
+  // if we're not using the blocklist.xml for certificate blocklist state,
+  // ensure that kinto update is enabled
+  if (!Services.prefs.getBoolPref("security.onecrl.via.amo")) {
+    ok(Services.prefs.getBoolPref("services.kinto.update_enabled", false),
+                                  "Kinto update should be enabled");
+  }
   blocklist.notify(null);
 }
 
 
 function end_test() {
   testserver.stop(do_test_finished);
 }