Bug 1261271 - Prevent test_blocklist_regexp.js permafailing when 48 reaches beta. r?mossop draft
authorMark Goodwin <mgoodwin@mozilla.com>
Wed, 13 Apr 2016 20:54:15 +0100
changeset 350448 078566b8aa499f300b7ac80f54b77bcbca6fb9ae
parent 350156 fb921246e2d60f521f83defed54e30a38df1be3e
child 518344 03cb241d381d630242638878e72f533d71c5ec15
push id15352
push usermgoodwin@mozilla.com
push dateWed, 13 Apr 2016 19:55:46 +0000
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);
 }