Backed out changeset 1efcba0d56db (bug 1542244) for Linting failure in /builds/worker/checkouts/gecko/testing/marionette/client/marionette_driver/geckoinstance.py. CLOSED TREE
authorDorel Luca <dluca@mozilla.com>
Tue, 21 May 2019 00:35:36 +0300
changeset 474609 2d5a9140e5591972a77fd575f599b8d3c5a87cc4
parent 474608 b702646a08e392ca61867731e4c2cac0160a9c38
child 474610 3e5aa7cb74603d4871493847d5644f1cc7919fa8
push id36042
push userdvarga@mozilla.com
push dateTue, 21 May 2019 04:19:40 +0000
treeherdermozilla-central@ca560ff55451 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1542244
milestone69.0a1
backs out1efcba0d56db1d3e12f0fecf3211af6d12a3a646
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
Backed out changeset 1efcba0d56db (bug 1542244) for Linting failure in /builds/worker/checkouts/gecko/testing/marionette/client/marionette_driver/geckoinstance.py. CLOSED TREE
testing/marionette/client/marionette_driver/geckoinstance.py
testing/marionette/prefs/marionette.js
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -54,19 +54,16 @@ class GeckoInstance(object):
 
         # Disable the ProcessHangMonitor
         "dom.ipc.reportProcessHangs": False,
 
         # No slow script dialogs
         "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,
         "extensions.enabledScopes": 5,
         # Disable metadata caching for installed add-ons by default
         "extensions.getAddons.cache.enabled": False,
         # Disable intalling any distribution add-ons
         "extensions.installDistroAddons": False,
@@ -114,19 +111,16 @@ class GeckoInstance(object):
         # Disable speculative connections so they aren"t reported as leaking when they"re
         # hanging around
         "network.http.speculative-parallel-limit": 0,
         # Do not automatically switch between offline and online
         "network.manage-offline-status": False,
         # 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,
 
         # Tests don't wait for the notification button security delay
         "security.notification_enable_delay": 0,
 
         # Ensure blocklist updates don't hit the network
         "services.settings.server": "http://%(server)s/dummy/blocklist/",
--- a/testing/marionette/prefs/marionette.js
+++ b/testing/marionette/prefs/marionette.js
@@ -31,14 +31,8 @@ pref("marionette.port", 2828);
 // Sets recommended automation preferences when Marionette is started.
 pref("marionette.prefs.recommended", true);
 
 // Whether content scripts can be safely reused.
 //
 // Deprecated and scheduled for removal
 // with https://bugzil.la/marionette-window-tracking
 pref("marionette.contentListener", false);
-
-// Turn off DOM Push
-pref("dom.push.connection.enabled", false);
-
-// Privacy and tracking protection
-pref("privacy.trackingprotection.enabled", false);