Bug 1546525 - Fix intermittent failure between blocklist clients tests and security settings r=glasserc,mgoodwin
authorMathieu Leplatre <mathieu@mozilla.com>
Fri, 26 Apr 2019 14:36:22 +0000
changeset 471519 da6e65869c99409518d0f2ccd2a2dc174aac1450
parent 471518 6e7ce11242e95f999435deeb3542ca17aaed685c
child 471520 1140aa6cfb408359845ca5a14db189c7597941aa
push id84142
push usermleplatre@mozilla.com
push dateFri, 26 Apr 2019 15:05:56 +0000
treeherderautoland@da6e65869c99 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglasserc, mgoodwin
bugs1546525
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1546525 - Fix intermittent failure between blocklist clients tests and security settings r=glasserc,mgoodwin Fix intermittent failure between blocklist clients tests and security settings Differential Revision: https://phabricator.services.mozilla.com/D28974
services/common/tests/unit/test_blocklist_clients.js
--- a/services/common/tests/unit/test_blocklist_clients.js
+++ b/services/common/tests/unit/test_blocklist_clients.js
@@ -35,16 +35,22 @@ function run_test() {
 
   // Point the blocklist clients to use this local HTTP server.
   Services.prefs.setCharPref("services.settings.server",
                              `http://localhost:${server.identity.primaryPort}/v1`);
   // Ensure that signature verification is disabled to prevent interference
   // with basic certificate sync tests
   Services.prefs.setBoolPref("services.settings.verify_signature", false);
 
+  // Unfortunately security settings are coupled with blocklists clients,
+  // this will be fixed in Bug 1526018
+  // We disable intermediate preloading because it runs when polling ends, and
+  // interferes with `clear_state()` from this test suite.
+  Services.prefs.setBoolPref("security.remote_settings.intermediates.enabled", false);
+
   // This will initialize the remote settings clients for blocklists.
   BlocklistClients.initialize();
 
   gBlocklistClients = [
     {client: BlocklistClients.AddonBlocklistClient, testData: ["i808", "i720", "i539"]},
     {client: BlocklistClients.PluginBlocklistClient, testData: ["p1044", "p32", "p28"]},
     {client: BlocklistClients.GfxBlocklistClient, testData: ["g204", "g200", "g36"]},
   ];