Bug 1358402 - Keep 'marionette.defaultPrefs.enabled' around as fallback. r=ato a=tomcat
authorHenrik Skupin <mail@hskupin.info>
Fri, 21 Apr 2017 11:16:06 +0200
changeset 402380 dd530a59750a
parent 402379 950b641e2b9c
child 402381 c8198aa6e767
child 402403 c852a5239fee
child 402482 9cb018faeab3
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersato, tomcat
bugs1358402, 1344748
milestone55.0a1
first release with
nightly linux32
dd530a59750a / 55.0a1 / 20170421100201 / files
nightly linux64
dd530a59750a / 55.0a1 / 20170421100201 / files
nightly mac
dd530a59750a / 55.0a1 / 20170421030241 / files
nightly win32
dd530a59750a / 55.0a1 / 20170421030241 / files
nightly win64
dd530a59750a / 55.0a1 / 20170421030241 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1358402 - Keep 'marionette.defaultPrefs.enabled' around as fallback. r=ato a=tomcat 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