Bug 1433497 - Include new Marionette prefs in Python client. r?whimboo
Some time ago the Marionette server renamed a couple of preferences to
be more in line with the naming scheme of other preferences in Gecko.
Unfortunately we forgot to update the Marionette Python client to
include these.
This patch does not remove the older preference names because there
is no need to unnecessarily break the client when it is used with
older Firefox versions, although in theory it is now safe to remove them.
MozReview-Commit-ID: 8gyFfgd2VkX
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -238,23 +238,25 @@ class GeckoInstance(object):
if isinstance(clone_from, Profile):
clone_from = clone_from.profile
self._update_profile(clone_from, profile_name=profile_name)
@property
def profile_args(self):
args = {"preferences": deepcopy(self.required_prefs)}
+ args["preferences"]["marionette.port"] = self.marionette_port
args["preferences"]["marionette.defaultPrefs.port"] = self.marionette_port
if self.prefs:
args["preferences"].update(self.prefs)
if self.verbose:
level = "TRACE" if self.verbose >= 2 else "DEBUG"
+ args["preferences"]["marionette.log.level"] = level
args["preferences"]["marionette.logging"] = level
if "-jsdebugger" in self.app_args:
args["preferences"].update({
"devtools.browsertoolbox.panel": "jsdebugger",
"devtools.debugger.remote-enabled": True,
"devtools.chrome.enabled": True,
"devtools.debugger.prompt-connection": False,