| Index: tools/telemetry/telemetry/core/browser_options_unittest.py
|
| diff --git a/tools/telemetry/telemetry/core/browser_options_unittest.py b/tools/telemetry/telemetry/core/browser_options_unittest.py
|
| index 9f016fab7bf25e1aaf365794b84b697abad0d2f8..c06a48071b33cc5162a3ac1886d5dafe7d11d228 100644
|
| --- a/tools/telemetry/telemetry/core/browser_options_unittest.py
|
| +++ b/tools/telemetry/telemetry/core/browser_options_unittest.py
|
| @@ -8,21 +8,21 @@ from telemetry.core import browser_options
|
|
|
| class BrowserOptionsTest(unittest.TestCase):
|
| def testDefaults(self):
|
| - options = browser_options.BrowserOptions()
|
| + options = browser_options.BrowserFinderOptions()
|
| parser = options.CreateParser()
|
| parser.add_option('-x', action='store', default=3)
|
| parser.parse_args(['--browser', 'any'])
|
| self.assertEquals(options.x, 3) # pylint: disable=E1101
|
|
|
| def testDefaultsPlusOverride(self):
|
| - options = browser_options.BrowserOptions()
|
| + options = browser_options.BrowserFinderOptions()
|
| parser = options.CreateParser()
|
| parser.add_option('-x', action='store', default=3)
|
| parser.parse_args(['--browser', 'any', '-x', 10])
|
| self.assertEquals(options.x, 10) # pylint: disable=E1101
|
|
|
| def testDefaultsDontClobberPresetValue(self):
|
| - options = browser_options.BrowserOptions()
|
| + options = browser_options.BrowserFinderOptions()
|
| setattr(options, 'x', 7)
|
| parser = options.CreateParser()
|
| parser.add_option('-x', action='store', default=3)
|
| @@ -30,21 +30,21 @@ class BrowserOptionsTest(unittest.TestCase):
|
| self.assertEquals(options.x, 7) # pylint: disable=E1101
|
|
|
| def testCount0(self):
|
| - options = browser_options.BrowserOptions()
|
| + options = browser_options.BrowserFinderOptions()
|
| parser = options.CreateParser()
|
| parser.add_option('-x', action='count', dest='v')
|
| parser.parse_args(['--browser', 'any'])
|
| self.assertEquals(options.v, None) # pylint: disable=E1101
|
|
|
| def testCount2(self):
|
| - options = browser_options.BrowserOptions()
|
| + options = browser_options.BrowserFinderOptions()
|
| parser = options.CreateParser()
|
| parser.add_option('-x', action='count', dest='v')
|
| parser.parse_args(['--browser', 'any', '-xx'])
|
| self.assertEquals(options.v, 2) # pylint: disable=E1101
|
|
|
| def testOptparseMutabilityWhenSpecified(self):
|
| - options = browser_options.BrowserOptions()
|
| + options = browser_options.BrowserFinderOptions()
|
| parser = options.CreateParser()
|
| parser.add_option('-x', dest='verbosity', action='store_true')
|
| options_ret, _ = parser.parse_args(['--browser', 'any', '-x'])
|
| @@ -52,7 +52,7 @@ class BrowserOptionsTest(unittest.TestCase):
|
| self.assertTrue(options.verbosity)
|
|
|
| def testOptparseMutabilityWhenNotSpecified(self):
|
| - options = browser_options.BrowserOptions()
|
| + options = browser_options.BrowserFinderOptions()
|
|
|
| parser = options.CreateParser()
|
| parser.add_option('-x', dest='verbosity', action='store_true')
|
| @@ -61,19 +61,19 @@ class BrowserOptionsTest(unittest.TestCase):
|
| self.assertFalse(options.verbosity)
|
|
|
| def testProfileDirDefault(self):
|
| - options = browser_options.BrowserOptions()
|
| + options = browser_options.BrowserFinderOptions()
|
| parser = options.CreateParser()
|
| parser.parse_args(['--browser', 'any'])
|
| self.assertEquals(options.profile_dir, None)
|
|
|
| def testProfileDir(self):
|
| - options = browser_options.BrowserOptions()
|
| + options = browser_options.BrowserFinderOptions()
|
| parser = options.CreateParser()
|
| parser.parse_args(['--browser', 'any', '--profile-dir', 'foo'])
|
| self.assertEquals(options.profile_dir, 'foo')
|
|
|
| def testMergeDefaultValues(self):
|
| - options = browser_options.BrowserOptions()
|
| + options = browser_options.BrowserFinderOptions()
|
| options.already_true = True
|
| options.already_false = False
|
| options.override_to_true = False
|
|
|