From c7072d92cfbb97b9d5410cc9fa5cbf7aacd8f574 Mon Sep 17 00:00:00 2001 From: David Burns Date: Wed, 5 Jun 2019 08:11:38 +0000 Subject: [PATCH] Bug 1542244: Disable Privacy and tracking protection features during testing. r=webdriver-reviewers,ato,whimboo When privacy and tracking protection is enabled there is a call home that can break tests. This uses the relavant prefs to disable the features. Differential Revision: https://phabricator.services.mozilla.com/D29644 --HG-- extra : moz-landing-system : lando --- testing/marionette/client/marionette_driver/geckoinstance.py | 6 ++++++ testing/marionette/components/marionette.js | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/testing/marionette/client/marionette_driver/geckoinstance.py b/testing/marionette/client/marionette_driver/geckoinstance.py index 75248fc636b5..d25fbb237526 100644 --- a/testing/marionette/client/marionette_driver/geckoinstance.py +++ b/testing/marionette/client/marionette_driver/geckoinstance.py @@ -59,6 +59,9 @@ class GeckoInstance(object): "dom.max_chrome_script_run_time": 0, "dom.max_script_run_time": 0, + # DOM Push + "dom.push.connection.enabled": False, + # Only load extensions from the application and user profile # AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_APPLICATION "extensions.autoDisableScopes": 0, @@ -116,6 +119,9 @@ class GeckoInstance(object): # Make sure SNTP requests don't hit the network "network.sntp.pools": "%(server)s", + # Privacy and Tracking Protection + "privacy.trackingprotection.enabled": False, + # Don't do network connections for mitm priming "security.certerrors.mitm.priming.enabled": False, diff --git a/testing/marionette/components/marionette.js b/testing/marionette/components/marionette.js index 5fb9061b4fab..7c40c7c02721 100644 --- a/testing/marionette/components/marionette.js +++ b/testing/marionette/components/marionette.js @@ -185,6 +185,9 @@ const RECOMMENDED_PREFS = new Map([ ["dom.max_chrome_script_run_time", 0], ["dom.max_script_run_time", 0], + // DOM Push + ["dom.push.connection.enabled", false], + // Only load extensions from the application and user profile // AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_APPLICATION // @@ -241,6 +244,9 @@ const RECOMMENDED_PREFS = new Map([ // Make sure SNTP requests do not hit the network ["network.sntp.pools", "%(server)s"], + // Privacy and Tracking Protection + ["privacy.trackingprotection.enabled", false], + // Don't do network connections for mitm priming ["security.certerrors.mitm.priming.enabled", false], -- 2.11.4.GIT