Bug 1480913: Convert extra_args field in talos firefox setup from a str to a list; r=rwood

--HG--
extra : rebase_source : e845ebd6fae6947d9986749a37b9db19b9585b1d
This commit is contained in:
Aaron Klotz 2018-08-03 13:45:35 -06:00
parent 2de70579a0
commit b9022848ae
3 changed files with 8 additions and 3 deletions

View File

@ -19,7 +19,7 @@ class ConfigurationError(Exception):
DEFAULTS = dict(
# args to pass to browser
extra_args='',
extra_args=[],
buildid='testbuildid',
init_url='getInfo.html',
env={'NO_EM_RESTART': '1'},

View File

@ -174,7 +174,10 @@ class FFSetup(object):
'appname',
'firefox'),
mozrunner.Runner)
args = [self.browser_config["extra_args"], self.browser_config["init_url"]]
args = list(self.browser_config["extra_args"])
args.append(self.browser_config["init_url"])
runner = runner_cls(profile=self.profile_dir,
binary=self.browser_config["browser_path"],
cmdargs=args,

View File

@ -122,11 +122,13 @@ def run_tests(config, browser_config):
if not test.get('profile', False):
test['profile'] = config.get('profile')
browser_config['extra_args'] = []
# pass --no-remote to firefox launch, if --develop is specified
# we do that to allow locally the user to have another running firefox
# instance
if browser_config['develop']:
browser_config['extra_args'] = '--no-remote'
browser_config['extra_args'].append('--no-remote')
# Pass subtests filter argument via a preference
if browser_config['subtests']: