| 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 352134140922d58ae0a25823d8f7227495eb3d00..0ef79f956825ab54882bc35f42de01c8d4a11a26 100644
|
| --- a/tools/telemetry/telemetry/unittest/run_tests.py
|
| +++ b/tools/telemetry/telemetry/unittest/run_tests.py
|
| @@ -10,13 +10,14 @@ from telemetry.core import browser_finder
|
| from telemetry.core import browser_options
|
| from telemetry.core import command_line
|
| from telemetry.core import discover
|
| -from telemetry.unittest import gtest_unittest_results
|
| +from telemetry.unittest import output_formatter_test_runner
|
|
|
|
|
| class Environment(object):
|
| - def __init__(self, top_level_dir, test_dirs):
|
| + def __init__(self, top_level_dir, test_dirs, output_formatters):
|
| self._top_level_dir = top_level_dir
|
| self._test_dirs = tuple(test_dirs)
|
| + self._output_formatters = tuple(output_formatters)
|
|
|
| @property
|
| def top_level_dir(self):
|
| @@ -26,10 +27,14 @@ class Environment(object):
|
| def test_dirs(self):
|
| return self._test_dirs
|
|
|
| + @property
|
| + def output_formatters(self):
|
| + return self._output_formatters
|
| +
|
|
|
| def Discover(start_dir, top_level_dir=None, pattern='test*.py'):
|
| loader = unittest.defaultTestLoader
|
| - loader.suiteClass = gtest_unittest_results.GTestTestSuite
|
| + loader.suiteClass = output_formatter_test_runner.OutputFormatterTestSuite
|
|
|
| test_suites = []
|
| modules = discover.DiscoverModules(start_dir, top_level_dir, pattern)
|
| @@ -76,7 +81,7 @@ def DiscoverTests(search_dirs, top_level_dir, possible_browser,
|
| method = getattr(test, test._testMethodName)
|
| return decorators.IsEnabled(method, possible_browser)
|
|
|
| - wrapper_suite = gtest_unittest_results.GTestTestSuite()
|
| + wrapper_suite = output_formatter_test_runner.OutputFormatterTestSuite()
|
| for search_dir in search_dirs:
|
| wrapper_suite.addTests(Discover(search_dir, top_level_dir, '*_unittest.py'))
|
| return FilterSuite(wrapper_suite, IsTestSelected)
|
| @@ -142,6 +147,7 @@ class RunTestsCommand(command_line.OptparseCommand):
|
| test_suite = DiscoverTests(
|
| environment.test_dirs, environment.top_level_dir, possible_browser,
|
| args.positional_args, args.run_disabled_tests)
|
| - runner = gtest_unittest_results.GTestTestRunner()
|
| - result = runner.run(test_suite, args.repeat_count, args)
|
| + runner = output_formatter_test_runner.OutputFormatterTestRunner()
|
| + result = runner.run(
|
| + test_suite, environment.output_formatters, args.repeat_count, args)
|
| return len(result.failures_and_errors)
|
|
|