Bug 1358402 - Keep 'marionette.defaultPrefs.enabled' around as fallback. r=ato a=test-only
authorHenrik Skupin <mail@hskupin.info>
Fri, 21 Apr 2017 11:16:06 +0200
changeset 395981 ede33bdbabd89c8137c39dfb7b803ce2ca5a5c4f
parent 395980 8ad85f4bb919841e980fe7251df54fba4466fd42
child 395982 7fad67b91a0888164d7f0257c359bcaab49648cf
push id1468
push userasasaki@mozilla.com
push dateMon, 05 Jun 2017 19:31:07 +0000
treeherdermozilla-release@0641fc6ee9d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersato, test-only
bugs1358402, 1344748
milestone54.0
Bug 1358402 - Keep 'marionette.defaultPrefs.enabled' around as fallback. r=ato a=test-only With bug 1344748 landed the default preferences and their handling has been changed. Builds starting with Firefox 54.0 can handle that, but previous releases don't enable Marionette at all after a restart under special conditions (invalidating 'update.status' file before the restart). To prevent the bustage we have to keep the preference 'marionette.defaultPrefs.enabled' around until the next ESR release is out. MozReview-Commit-ID: AB3liJlb6M7
testing/marionette/client/marionette_driver/geckoinstance.py
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -69,16 +69,18 @@ class GeckoInstance(object):
 
         # No hang monitor
         "hangmonitor.timeout": 0,
 
         "javascript.options.showInConsole": True,
 
         # Enable Marionette component
         "marionette.enabled": True,
+        # Deprecated, and can be removed in Firefox 60.0
+        "marionette.defaultPrefs.enabled": True,
         # Disable recommended automation prefs in CI
         "marionette.prefs.recommended": False,
 
         "media.volume_scale": "0.01",
 
         # Make sure the disk cache doesn't get auto disabled
         "network.http.bypass-cachelock-threshold": 200000,
         # Do not prompt for temporary redirects