For consistency with benchmark, rename unittest.output_formatter -> progress_reporter.

BUG=397746

Review URL: https://codereview.chromium.org/439503006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288541 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 77 insertions, 74 deletions

diff --git a/tools/chrome_proxy/run_tests b/tools/chrome_proxy/run_tests
index 37241ca..e2f69a0 100755
--- a/tools/chrome_proxy/run_tests
+++ b/tools/chrome_proxy/run_tests
@@ -14,13 +14,13 @@ import sys
 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry'))
 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'perf'))
 
-from telemetry.unittest import gtest_output_formatter
+from telemetry.unittest import gtest_progress_reporter
 from telemetry.unittest import run_tests
 
 
 if __name__ == '__main__':
   base_dir = os.path.dirname(os.path.realpath(__file__))
-  output_formatters = [
-      gtest_output_formatter.GTestOutputFormatter(sys.stdout)]
-  run_tests.config = run_tests.Config(base_dir, [base_dir], output_formatters)
+  progress_reporters = [
+      gtest_progress_reporter.GTestProgressReporter(sys.stdout)]
+  run_tests.config = run_tests.Config(base_dir, [base_dir], progress_reporters)
   sys.exit(run_tests.RunTestsCommand.main())
diff --git a/tools/perf/benchmarks/benchmark_unittest.py b/tools/perf/benchmarks/benchmark_unittest.py
index 61aebdc..ce61844 100644
--- a/tools/perf/benchmarks/benchmark_unittest.py
+++ b/tools/perf/benchmarks/benchmark_unittest.py
@@ -15,7 +15,7 @@ from telemetry import benchmark as benchmark_module
 from telemetry.core import discover
 from telemetry.page import page_measurement
 from telemetry.unittest import options_for_unittests
-from telemetry.unittest import output_formatter
+from telemetry.unittest import progress_reporter
 
 
 def SmokeTestGenerator(benchmark):
@@ -58,7 +58,7 @@ def SmokeTestGenerator(benchmark):
 
 
 def load_tests(_, _2, _3):
-  suite = output_formatter.TestSuite()
+  suite = progress_reporter.TestSuite()
 
   benchmarks_dir = os.path.dirname(__file__)
   top_level_dir = os.path.dirname(benchmarks_dir)
diff --git a/tools/perf/run_tests b/tools/perf/run_tests
index e5dbf09..6497020 100755
--- a/tools/perf/run_tests
+++ b/tools/perf/run_tests
@@ -13,13 +13,13 @@ import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry'))
 
-from telemetry.unittest import gtest_output_formatter
+from telemetry.unittest import gtest_progress_reporter
 from telemetry.unittest import run_tests
 
 
 if __name__ == '__main__':
   base_dir = os.path.dirname(os.path.realpath(__file__))
-  output_formatters = [
-      gtest_output_formatter.GTestOutputFormatter(sys.stdout)]
-  run_tests.config = run_tests.Config(base_dir, [base_dir], output_formatters)
+  progress_reporters = [
+      gtest_progress_reporter.GTestProgressReporter(sys.stdout)]
+  run_tests.config = run_tests.Config(base_dir, [base_dir], progress_reporters)
   sys.exit(run_tests.RunTestsCommand.main())
diff --git a/tools/telemetry/run_tests b/tools/telemetry/run_tests
index 7a217f2..96a0835 100755
--- a/tools/telemetry/run_tests
+++ b/tools/telemetry/run_tests
@@ -6,13 +6,13 @@
 import os
 import sys
 
-from telemetry.unittest import gtest_output_formatter
+from telemetry.unittest import gtest_progress_reporter
 from telemetry.unittest import run_tests
 
 
 if __name__ == '__main__':
   base_dir = os.path.dirname(os.path.realpath(__file__))
-  output_formatters = [
-      gtest_output_formatter.GTestOutputFormatter(sys.stdout)]
-  run_tests.config = run_tests.Config(base_dir, [base_dir], output_formatters)
+  progress_reporters = [
+      gtest_progress_reporter.GTestProgressReporter(sys.stdout)]
+  run_tests.config = run_tests.Config(base_dir, [base_dir], progress_reporters)
   sys.exit(run_tests.RunTestsCommand.main())
diff --git a/tools/telemetry/telemetry/unittest/gtest_output_formatter.py b/tools/telemetry/telemetry/unittest/gtest_progress_reporter.py
index cdf1a52..66d7917 100644
--- a/tools/telemetry/telemetry/unittest/gtest_output_formatter.py
+++ b/tools/telemetry/telemetry/unittest/gtest_progress_reporter.py
@@ -6,7 +6,7 @@ import logging
 import time
 import unittest
 
-from telemetry.unittest import output_formatter
+from telemetry.unittest import progress_reporter
 from telemetry.util import exception_formatter
 
 
@@ -15,9 +15,9 @@ def _FormatTestName(test):
   return '.'.join(chunks)
 
 
-class GTestOutputFormatter(output_formatter.OutputFormatter):
+class GTestProgressReporter(progress_reporter.ProgressReporter):
   def __init__(self, output_stream):
-    super(GTestOutputFormatter, self).__init__(output_stream)
+    super(GTestProgressReporter, self).__init__(output_stream)
     self._suite_start_time = None
     self._test_start_time = None
 
diff --git a/tools/telemetry/telemetry/unittest/gtest_output_formatter_unittest.py b/tools/telemetry/telemetry/unittest/gtest_progress_reporter_unittest.py
index 0eff246..c13be46 100644
--- a/tools/telemetry/telemetry/unittest/gtest_output_formatter_unittest.py
+++ b/tools/telemetry/telemetry/unittest/gtest_progress_reporter_unittest.py
@@ -5,7 +5,7 @@
 import unittest
 import sys
 
-from telemetry.unittest import gtest_output_formatter
+from telemetry.unittest import gtest_progress_reporter
 from telemetry.unittest import simple_mock
 
 
@@ -49,18 +49,19 @@ class TestResultWithSuccesses(unittest.TestResult):
     self.successes.append(test)
 
 
-class GTestOutputFormatterTest(unittest.TestCase):
+class GTestProgressReporterTest(unittest.TestCase):
   def setUp(self):
-    super(GTestOutputFormatterTest, self).setUp()
+    super(GTestProgressReporterTest, self).setUp()
     self._stream = TestOutputStream()
-    self._formatter = gtest_output_formatter.GTestOutputFormatter(self._stream)
+    self._formatter = gtest_progress_reporter.GTestProgressReporter(
+        self._stream)
 
     self._mock_timer = simple_mock.MockTimer()
-    self._real_time_time = gtest_output_formatter.time.time
-    gtest_output_formatter.time.time = self._mock_timer.GetTime
+    self._real_time_time = gtest_progress_reporter.time.time
+    gtest_progress_reporter.time.time = self._mock_timer.GetTime
 
   def tearDown(self):
-    gtest_output_formatter.time.time = self._real_time_time
+    gtest_progress_reporter.time.time = self._real_time_time
 
   def testTestSuiteWithWrapperSuite(self):
     suite = unittest.TestSuite()
@@ -87,9 +88,10 @@ class GTestOutputFormatterTest(unittest.TestCase):
     self._mock_timer.SetTime(0.042)
     self._formatter.Failure(test, DUMMY_EXCEPTION)
 
-    expected = ('[ RUN      ] gtest_output_formatter_unittest.TestFoo.runTezt\n'
-                '[  FAILED  ] gtest_output_formatter_unittest.TestFoo.runTezt '
-                '(42 ms)\n')
+    expected = (
+        '[ RUN      ] gtest_progress_reporter_unittest.TestFoo.runTezt\n'
+        '[  FAILED  ] gtest_progress_reporter_unittest.TestFoo.runTezt '
+        '(42 ms)\n')
     self.assertEqual(self._stream.output_data, expected)
 
   def testCaseSuccess(self):
@@ -98,9 +100,10 @@ class GTestOutputFormatterTest(unittest.TestCase):
     self._mock_timer.SetTime(0.042)
     self._formatter.Success(test)
 
-    expected = ('[ RUN      ] gtest_output_formatter_unittest.TestFoo.runTezt\n'
-                '[       OK ] gtest_output_formatter_unittest.TestFoo.runTezt '
-                '(42 ms)\n')
+    expected = (
+        '[ RUN      ] gtest_progress_reporter_unittest.TestFoo.runTezt\n'
+        '[       OK ] gtest_progress_reporter_unittest.TestFoo.runTezt '
+        '(42 ms)\n')
     self.assertEqual(self._stream.output_data, expected)
 
   def testStopTestRun(self):
@@ -120,6 +123,6 @@ class GTestOutputFormatterTest(unittest.TestCase):
     expected = (
         '[  PASSED  ] 1 test.\n'
         '[  FAILED  ] 1 test, listed below:\n'
-        '[  FAILED  ]  gtest_output_formatter_unittest.TestFoo.runTezt\n\n'
+        '[  FAILED  ]  gtest_progress_reporter_unittest.TestFoo.runTezt\n\n'
         '1 FAILED TEST\n\n')
     self.assertEqual(self._stream.output_data, expected)
diff --git a/tools/telemetry/telemetry/unittest/output_formatter.py b/tools/telemetry/telemetry/unittest/progress_reporter.py
index c69faa3..76a6be6 100644
--- a/tools/telemetry/telemetry/unittest/output_formatter.py
+++ b/tools/telemetry/telemetry/unittest/progress_reporter.py
@@ -8,7 +8,7 @@ from telemetry.core import util
 from telemetry.unittest import options_for_unittests
 
 
-class OutputFormatter(object):
+class ProgressReporter(object):
   def __init__(self, output_stream):
     self._output_stream = output_stream
 
@@ -55,9 +55,9 @@ class TestSuite(unittest.TestSuite):
 
 
 class TestRunner(object):
-  def run(self, test, output_formatters, repeat_count, args):
+  def run(self, test, progress_reporters, repeat_count, args):
     util.AddDirToPythonPath(util.GetUnittestDataDir())
-    result = TestResult(output_formatters)
+    result = TestResult(progress_reporters)
     result.startTestRun()
     try:
       options_for_unittests.Push(args)
@@ -71,10 +71,10 @@ class TestRunner(object):
 
 
 class TestResult(unittest.TestResult):
-  def __init__(self, output_formatters):
+  def __init__(self, progress_reporters):
     super(TestResult, self).__init__()
     self.successes = []
-    self._output_formatters = output_formatters
+    self._progress_reporters = progress_reporters
 
   @property
   def failures_and_errors(self):
@@ -82,49 +82,49 @@ class TestResult(unittest.TestResult):
 
   def startTest(self, test):
     super(TestResult, self).startTest(test)
-    for output_formatter in self._output_formatters:
-      output_formatter.StartTest(test)
+    for progress_reporter in self._progress_reporters:
+      progress_reporter.StartTest(test)
 
   def startTestSuite(self, suite):
-    for output_formatter in self._output_formatters:
-      output_formatter.StartTestSuite(suite)
+    for progress_reporter in self._progress_reporters:
+      progress_reporter.StartTestSuite(suite)
 
   def startTestRun(self):
     super(TestResult, self).startTestRun()
-    for output_formatter in self._output_formatters:
-      output_formatter.StartTestRun()
+    for progress_reporter in self._progress_reporters:
+      progress_reporter.StartTestRun()
 
   def stopTest(self, test):
     super(TestResult, self).stopTest(test)
-    for output_formatter in self._output_formatters:
-      output_formatter.StopTest(test)
+    for progress_reporter in self._progress_reporters:
+      progress_reporter.StopTest(test)
 
   def stopTestSuite(self, suite):
-    for output_formatter in self._output_formatters:
-      output_formatter.StopTestSuite(suite)
+    for progress_reporter in self._progress_reporters:
+      progress_reporter.StopTestSuite(suite)
 
   def stopTestRun(self):
     super(TestResult, self).stopTestRun()
-    for output_formatter in self._output_formatters:
-      output_formatter.StopTestRun(self)
+    for progress_reporter in self._progress_reporters:
+      progress_reporter.StopTestRun(self)
 
   def addError(self, test, err):
     super(TestResult, self).addError(test, err)
-    for output_formatter in self._output_formatters:
-      output_formatter.Error(test, err)
+    for progress_reporter in self._progress_reporters:
+      progress_reporter.Error(test, err)
 
   def addFailure(self, test, err):
     super(TestResult, self).addFailure(test, err)
-    for output_formatter in self._output_formatters:
-      output_formatter.Failure(test, err)
+    for progress_reporter in self._progress_reporters:
+      progress_reporter.Failure(test, err)
 
   def addSuccess(self, test):
     super(TestResult, self).addSuccess(test)
     self.successes.append(test)
-    for output_formatter in self._output_formatters:
-      output_formatter.Success(test)
+    for progress_reporter in self._progress_reporters:
+      progress_reporter.Success(test)
 
   def addSkip(self, test, reason):
     super(TestResult, self).addSkip(test, reason)
-    for output_formatter in self._output_formatters:
-      output_formatter.Skip(test, reason)
+    for progress_reporter in self._progress_reporters:
+      progress_reporter.Skip(test, reason)
diff --git a/tools/telemetry/telemetry/unittest/output_formatter_unittest.py b/tools/telemetry/telemetry/unittest/progress_reporter_unittest.py
index 571062b..1da34f4 100644
--- a/tools/telemetry/telemetry/unittest/output_formatter_unittest.py
+++ b/tools/telemetry/telemetry/unittest/progress_reporter_unittest.py
@@ -4,7 +4,7 @@
 
 import unittest
 
-from telemetry.unittest import output_formatter
+from telemetry.unittest import progress_reporter
 
 
 class TestFoo(unittest.TestCase):
@@ -17,7 +17,7 @@ class TestFoo(unittest.TestCase):
     self.fail('expected failure')
 
 
-class LoggingOutputFormatter(object):
+class LoggingProgressReporter(object):
   def __init__(self):
     self._call_log = []
 
@@ -31,16 +31,16 @@ class LoggingOutputFormatter(object):
     return wrapper
 
 
-class OutputFormatterTest(unittest.TestCase):
+class ProgressReporterTest(unittest.TestCase):
   def testTestRunner(self):
-    suite = output_formatter.TestSuite()
+    suite = progress_reporter.TestSuite()
     suite.addTest(TestFoo(methodName='RunPassingTest'))
     suite.addTest(TestFoo(methodName='RunFailingTest'))
 
-    formatter = LoggingOutputFormatter()
-    runner = output_formatter.TestRunner()
-    output_formatters = (formatter,)
-    result = runner.run(suite, output_formatters, 1, None)
+    reporter = LoggingProgressReporter()
+    runner = progress_reporter.TestRunner()
+    progress_reporters = (reporter,)
+    result = runner.run(suite, progress_reporters, 1, None)
 
     self.assertEqual(len(result.successes), 1)
     self.assertEqual(len(result.failures), 1)
@@ -51,4 +51,4 @@ class OutputFormatterTest(unittest.TestCase):
         'StartTest', 'Failure', 'StopTest',
         'StopTestSuite', 'StopTestRun',
     )
-    self.assertEqual(formatter.call_log, expected)
+    self.assertEqual(reporter.call_log, expected)
diff --git a/tools/telemetry/telemetry/unittest/run_tests.py b/tools/telemetry/telemetry/unittest/run_tests.py
index 570aa35..65374bc 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