Bug 1101539 - Make Marionette's GeckoInstance actually support passing a nonstandard port. r=jgriffin

This commit is contained in:
Ted Mielczarek 2014-11-20 08:34:37 -05:00
parent 88b2e61eb5
commit 69019f592c

View File

@ -16,7 +16,6 @@ from mozrunner import Runner
class GeckoInstance(object):
required_prefs = {"marionette.defaultPrefs.enabled": True,
"marionette.defaultPrefs.port": 2828,
"marionette.logging": True,
"startup.homepage_welcome_url": "about:blank",
"browser.shell.checkDefaultBrowser": False,
@ -45,6 +44,7 @@ class GeckoInstance(object):
def start(self):
profile_args = {"preferences": deepcopy(self.required_prefs)}
profile_args["preferences"]["marionette.defaultPrefs.port"] = self.marionette_port
if self.prefs:
profile_args["preferences"].update(self.prefs)
if not self.profile_path: