Bug 1355888 - Mark marionette.enabled pref in client as a deprecated; r?whimboo draft
authorAndreas Tolfsen <ato@mozilla.com>
Thu, 13 Apr 2017 15:08:49 +0100
changeset 567001 92125174608ec1919e908349fe0c3a5ae884da0a
parent 567000 7eac3b4af6a194a93b0f5c05bfd1d557637c07d7
child 567002 42092462d6be41067c1179c0bc086d5c4c138d62
push id55406
push userbmo:ato@mozilla.com
push dateMon, 24 Apr 2017 09:34:42 +0000
reviewerswhimboo
bugs1355888
milestone55.0a1
Bug 1355888 - Mark marionette.enabled pref in client as a deprecated; r?whimboo To preserve backwards compatibility for in-app restarts using Services.startup.quit(eRestart), we want to continue using the marionette.enabled preference in the Python client until the patch introducing the MARIONETTE environment variable (preceding this) makes it into an official release. This is due to the fact that the Marionette Python client is being used for upgrade tests, and it is needs to stay compatible with all release trains. MozReview-Commit-ID: KstsJRu4lIP
testing/marionette/client/marionette_driver/geckoinstance.py
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -68,16 +68,17 @@ class GeckoInstance(object):
         "geo.wifi.scan": False,
 
         # No hang monitor
         "hangmonitor.timeout": 0,
 
         "javascript.options.showInConsole": True,
 
         # Enable Marionette component
+        # Deprecated and can be removed when Firefox 60 ships
         "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",