diff options
Diffstat (limited to 'tools')
10 files changed, 23 insertions, 23 deletions
diff --git a/tools/telemetry/examples/telemetry_perf_test.py b/tools/telemetry/examples/telemetry_perf_test.py index 14f20cc..f509939 100755 --- a/tools/telemetry/examples/telemetry_perf_test.py +++ b/tools/telemetry/examples/telemetry_perf_test.py @@ -12,7 +12,7 @@ from telemetry.core import browser_finder from telemetry.core import browser_options def Main(args): - options = browser_options.BrowserOptions() + options = browser_options.BrowserFinderOptions() parser = options.CreateParser('telemetry_perf_test.py') options, args = parser.parse_args(args) diff --git a/tools/telemetry/telemetry/__init__.py b/tools/telemetry/telemetry/__init__.py index cb4f71d..e3f9994 100644 --- a/tools/telemetry/telemetry/__init__.py +++ b/tools/telemetry/telemetry/__init__.py @@ -9,7 +9,7 @@ import os import sys from telemetry.core.browser import Browser -from telemetry.core.browser_options import BrowserOptions +from telemetry.core.browser_options import BrowserFinderOptions from telemetry.core.tab import Tab from telemetry.page.page_measurement import PageMeasurement diff --git a/tools/telemetry/telemetry/core/browser_options.py b/tools/telemetry/telemetry/core/browser_options.py index 4078fe4..f4440d9 100644 --- a/tools/telemetry/telemetry/core/browser_options.py +++ b/tools/telemetry/telemetry/core/browser_options.py @@ -16,7 +16,7 @@ from telemetry.core import util from telemetry.core import wpr_modes from telemetry.core.platform.profiler import profiler_finder -class BrowserOptions(optparse.Values): +class BrowserFinderOptions(optparse.Values): """Options to be used for discovering and launching a browser.""" def __init__(self, browser_type=None): diff --git a/tools/telemetry/telemetry/core/browser_options_unittest.py b/tools/telemetry/telemetry/core/browser_options_unittest.py index 9f016fa..c06a480 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 diff --git a/tools/telemetry/telemetry/core/chrome/android_browser_finder_unittest.py b/tools/telemetry/telemetry/core/chrome/android_browser_finder_unittest.py index c1e4fcf..5fece9d 100644 --- a/tools/telemetry/telemetry/core/chrome/android_browser_finder_unittest.py +++ b/tools/telemetry/telemetry/core/chrome/android_browser_finder_unittest.py @@ -27,7 +27,7 @@ class AndroidBrowserFinderTest(unittest.TestCase): self._stubs.Restore() def test_no_adb(self): - options = browser_options.BrowserOptions() + options = browser_options.BrowserFinderOptions() def NoAdb(*args, **kargs): # pylint: disable=W0613 raise OSError('not found') @@ -36,14 +36,14 @@ class AndroidBrowserFinderTest(unittest.TestCase): self.assertEquals(0, len(browsers)) def test_adb_no_devices(self): - options = browser_options.BrowserOptions() + options = browser_options.BrowserFinderOptions() browsers = android_browser_finder.FindAllAvailableBrowsers(options) self.assertEquals(0, len(browsers)) def test_adb_permissions_error(self): - options = browser_options.BrowserOptions() + options = browser_options.BrowserFinderOptions() self._stubs.subprocess.Popen.communicate_result = ( """List of devices attached @@ -60,7 +60,7 @@ class AndroidBrowserFinderTest(unittest.TestCase): def test_adb_two_devices(self): - options = browser_options.BrowserOptions() + options = browser_options.BrowserFinderOptions() self._stubs.adb_commands.attached_devices = ['015d14fec128220c', '015d14fec128220d'] @@ -72,7 +72,7 @@ class AndroidBrowserFinderTest(unittest.TestCase): self.assertEquals(0, len(browsers)) def test_adb_one_device(self): - options = browser_options.BrowserOptions() + options = browser_options.BrowserFinderOptions() self._stubs.adb_commands.attached_devices = ['015d14fec128220c'] diff --git a/tools/telemetry/telemetry/core/chrome/desktop_browser_finder_unittest.py b/tools/telemetry/telemetry/core/chrome/desktop_browser_finder_unittest.py index fe0e6ae..82ea7b2 100644 --- a/tools/telemetry/telemetry/core/chrome/desktop_browser_finder_unittest.py +++ b/tools/telemetry/telemetry/core/chrome/desktop_browser_finder_unittest.py @@ -15,7 +15,7 @@ from telemetry.unittest import system_stub class FindTestBase(unittest.TestCase): def setUp(self): - self._options = browser_options.BrowserOptions() + self._options = browser_options.BrowserFinderOptions() self._options.chrome_root = '../../../' self._stubs = system_stub.Override(desktop_browser_finder, ['os', 'subprocess', 'sys']) diff --git a/tools/telemetry/telemetry/page/page_test_runner.py b/tools/telemetry/telemetry/page/page_test_runner.py index 623a5c8..e9e66d3 100644 --- a/tools/telemetry/telemetry/page/page_test_runner.py +++ b/tools/telemetry/telemetry/page/page_test_runner.py @@ -130,7 +130,7 @@ class PageTestRunner(object): # Need to collect profile creators before creating command line parser. profile_types.FindProfileCreators(base_dir, base_dir) - self._options = browser_options.BrowserOptions() + self._options = browser_options.BrowserFinderOptions() self._parser = self._options.CreateParser( '%%prog [options] %s page_set' % self.test_class_name) diff --git a/tools/telemetry/telemetry/page/record_wpr.py b/tools/telemetry/telemetry/page/record_wpr.py index 1329073..bbec64d4 100755 --- a/tools/telemetry/telemetry/page/record_wpr.py +++ b/tools/telemetry/telemetry/page/record_wpr.py @@ -65,7 +65,7 @@ def Main(base_dir): page_measurement.PageMeasurement) tests = discover.DiscoverClasses(base_dir, base_dir, test.Test, index_by_class_name=True) - options = browser_options.BrowserOptions() + options = browser_options.BrowserFinderOptions() parser = options.CreateParser('%prog <PageSet|Measurement|Test>') page_runner.AddCommandLineOptions(parser) diff --git a/tools/telemetry/telemetry/test_runner.py b/tools/telemetry/telemetry/test_runner.py index d3c4def9..9555341 100644 --- a/tools/telemetry/telemetry/test_runner.py +++ b/tools/telemetry/telemetry/test_runner.py @@ -89,7 +89,7 @@ class Run(Command): usage = 'test_name [...] [<args>]' def CreateParser(self): - options = browser_options.BrowserOptions() + options = browser_options.BrowserFinderOptions() parser = options.CreateParser('%%prog %s %s' % (self.name, self.usage)) return parser diff --git a/tools/telemetry/telemetry/unittest/run_tests.py b/tools/telemetry/telemetry/unittest/run_tests.py index 89f4ad1..f38348f 100644 --- a/tools/telemetry/telemetry/unittest/run_tests.py +++ b/tools/telemetry/telemetry/unittest/run_tests.py @@ -85,7 +85,7 @@ def Main(args, start_dir, top_level_dir, runner=None): # Add unittest_data to the path so we can import packages from it. util.AddDirToPythonPath(util.GetUnittestDataDir()) - default_options = browser_options.BrowserOptions() + default_options = browser_options.BrowserFinderOptions() default_options.browser_type = 'any' parser = default_options.CreateParser('run_tests [options] [test names]') |