Index: tools/telemetry/telemetry/unittest/run_tests.py |
diff --git a/tools/telemetry/telemetry/unittest/run_tests.py b/tools/telemetry/telemetry/unittest/run_tests.py |
index 570aa359added1b938b437b5c1204d973df98faf..65374bca387ab4786448229bcce4646298ce76bf 100644 |
--- a/tools/telemetry/telemetry/unittest/run_tests.py |
+++ b/tools/telemetry/telemetry/unittest/run_tests.py |
@@ -11,14 +11,14 @@ from telemetry.core import browser_options |
from telemetry.core import command_line |
from telemetry.core import discover |
from telemetry.unittest import json_results |
-from telemetry.unittest import output_formatter |
+from telemetry.unittest import progress_reporter |
class Config(object): |
- def __init__(self, top_level_dir, test_dirs, output_formatters): |
+ def __init__(self, top_level_dir, test_dirs, progress_reporters): |
self._top_level_dir = top_level_dir |
self._test_dirs = tuple(test_dirs) |
- self._output_formatters = tuple(output_formatters) |
+ self._progress_reporters = tuple(progress_reporters) |
@property |
def top_level_dir(self): |
@@ -29,13 +29,13 @@ class Config(object): |
return self._test_dirs |
@property |
- def output_formatters(self): |
- return self._output_formatters |
+ def progress_reporters(self): |
+ return self._progress_reporters |
def Discover(start_dir, top_level_dir=None, pattern='test*.py'): |
loader = unittest.defaultTestLoader |
- loader.suiteClass = output_formatter.TestSuite |
+ loader.suiteClass = progress_reporter.TestSuite |
test_suites = [] |
modules = discover.DiscoverModules(start_dir, top_level_dir, pattern) |
@@ -82,7 +82,7 @@ def DiscoverTests(search_dirs, top_level_dir, possible_browser, |
method = getattr(test, test._testMethodName) |
return decorators.IsEnabled(method, possible_browser) |
- wrapper_suite = output_formatter.TestSuite() |
+ wrapper_suite = progress_reporter.TestSuite() |
for search_dir in search_dirs: |
wrapper_suite.addTests(Discover(search_dir, top_level_dir, '*_unittest.py')) |
return FilterSuite(wrapper_suite, IsTestSelected) |
@@ -176,8 +176,8 @@ class RunTestsCommand(command_line.OptparseCommand): |
test_suite = DiscoverTests(config.test_dirs, config.top_level_dir, |
possible_browser, args.positional_args, |
args.run_disabled_tests) |
- runner = output_formatter.TestRunner() |
- result = runner.run(test_suite, config.output_formatters, |
+ runner = progress_reporter.TestRunner() |
+ result = runner.run(test_suite, config.progress_reporters, |
args.repeat_count, args) |
return test_suite, result |