Commit 6fb79a31 authored by bulach@chromium.org's avatar bulach@chromium.org

Telemetry: small fix for extra browser args.

Following crrev.com/221590, use the new API instead.

BUG=269131

Review URL: https://chromiumcodereview.appspot.com/23785006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222030 0039d316-1c4b-4281-b951-d872f2087c98
parent 470a2f66
...@@ -256,7 +256,7 @@ class BrowserOptions(): ...@@ -256,7 +256,7 @@ class BrowserOptions():
if hasattr(self, 'extra_browser_args_as_string'): # pylint: disable=E1101 if hasattr(self, 'extra_browser_args_as_string'): # pylint: disable=E1101
tmp = shlex.split( tmp = shlex.split(
self.extra_browser_args_as_string) # pylint: disable=E1101 self.extra_browser_args_as_string) # pylint: disable=E1101
self._extra_browser_args.extend(tmp) self.AppendExtraBrowserArgs(tmp)
delattr(self, 'extra_browser_args_as_string') delattr(self, 'extra_browser_args_as_string')
if hasattr(self, 'extra_wpr_args_as_string'): # pylint: disable=E1101 if hasattr(self, 'extra_wpr_args_as_string'): # pylint: disable=E1101
tmp = shlex.split( tmp = shlex.split(
......
...@@ -72,6 +72,14 @@ class BrowserOptionsTest(unittest.TestCase): ...@@ -72,6 +72,14 @@ class BrowserOptionsTest(unittest.TestCase):
parser.parse_args(['--browser', 'any', '--profile-dir', 'foo']) parser.parse_args(['--browser', 'any', '--profile-dir', 'foo'])
self.assertEquals(options.browser_options.profile_dir, 'foo') self.assertEquals(options.browser_options.profile_dir, 'foo')
def testExtraBrowserArgs(self):
options = browser_options.BrowserFinderOptions()
parser = options.CreateParser()
parser.parse_args(['--extra-browser-args=--foo --bar'])
self.assertEquals(options.browser_options.extra_browser_args,
set(['--foo','--bar']))
def testMergeDefaultValues(self): def testMergeDefaultValues(self):
options = browser_options.BrowserFinderOptions() options = browser_options.BrowserFinderOptions()
options.already_true = True options.already_true = True
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment