Bug 1261271 - Prevent test_blocklist_regexp.js permafailing when 48 reaches beta. r?mossop
MozReview-Commit-ID: 62zsxvFIrK2
--- 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);
}