Have all --output-format produces progress report (in gtest-style).

tools/telemetry/telemetry/results/gtest_progress_reporter_unittest.py

Index: tools/telemetry/telemetry/results/gtest_progress_reporter_unittest.py
diff --git a/tools/telemetry/telemetry/results/gtest_test_results_unittest.py b/tools/telemetry/telemetry/results/gtest_progress_reporter_unittest.py
similarity index 69%
copy from tools/telemetry/telemetry/results/gtest_test_results_unittest.py
copy to tools/telemetry/telemetry/results/gtest_progress_reporter_unittest.py
index 36f7328746abd89271967f536968c21c22113a68..cadf22d97795502f1085518afdda2eda90aa0cac 100644
--- a/tools/telemetry/telemetry/results/gtest_test_results_unittest.py
+++ b/tools/telemetry/telemetry/results/gtest_progress_reporter_unittest.py
@@ -1,12 +1,14 @@
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+
 import os
 import traceback
 
 from telemetry.page import page_set
 from telemetry.results import base_test_results_unittest
-from telemetry.results import gtest_test_results
+from telemetry.results import gtest_progress_reporter
+from telemetry.results import page_test_results
 from telemetry.unittest import simple_mock
 from telemetry.value import failure
 from telemetry.value import skip
@@ -21,28 +23,27 @@ def _MakePageSet():
   return ps
 
 
-class SummaryGtestTestResults(
-    gtest_test_results.GTestTestResults):
-
-  def __init__(self):
-    super(SummaryGtestTestResults, self).__init__(
-        base_test_results_unittest.TestOutputStream())
-    self.output_data = self._output_stream.output_data
-
-
-class GTestTestResultsTest(
+class GTestProgressReporterTest(
     base_test_results_unittest.BaseTestResultsUnittest):
 
   def setUp(self):
-    super(GTestTestResultsTest, self).setUp()
+    super(GTestProgressReporterTest, self).setUp()
     self._mock_timer = simple_mock.MockTimer()
-    self._real_gtest_time_time = gtest_test_results.time.time
-    gtest_test_results.time.time = self._mock_timer.GetTime
+    self._real_progress_reporter_time_time = gtest_progress_reporter.time.time
+    gtest_progress_reporter.time.time = self._mock_timer.GetTime
+
+    self._output_stream = base_test_results_unittest.TestOutputStream()
+    self._reporter = gtest_progress_reporter.GTestProgressReporter(
+        self._output_stream)
+
+  def tearDown(self):
+    gtest_progress_reporter.time.time = self._real_progress_reporter_time_time
 
   def testSingleSuccessPage(self):
     test_page_set = _MakePageSet()
 
-    results = SummaryGtestTestResults()
+    results = page_test_results.PageTestResults(
+        progress_reporter=self._reporter)
     results.WillRunPage(test_page_set.pages[0])
     self._mock_timer.SetTime(0.007)
     results.AddSuccess(test_page_set.pages[0])
@@ -52,12 +53,13 @@ class GTestTestResultsTest(
     expected = ('[ RUN      ] http://www.foo.com/\n'
                 '[       OK ] http://www.foo.com/ (7 ms)\n'
                 '[  PASSED  ] 1 test.\n\n')
-    self.assertEquals(expected, ''.join(results.output_data))
+    self.assertEquals(expected, ''.join(self._output_stream.output_data))
 
   def testSingleFailedPage(self):
     test_page_set = _MakePageSet()
 
-    results = SummaryGtestTestResults()
+    results = page_test_results.PageTestResults(
+        progress_reporter=self._reporter)
     results.WillRunPage(test_page_set.pages[0])
     exc_info = self.CreateException()
     results.AddValue(failure.FailureValue(test_page_set.pages[0], exc_info))
@@ -72,11 +74,12 @@ class GTestTestResultsTest(
                 '[  FAILED  ] 1 test, listed below:\n'
                 '[  FAILED  ]  http://www.foo.com/\n\n'
                 '1 FAILED TEST\n\n' % exception_trace)
-    self.assertEquals(expected, ''.join(results.output_data))
+    self.assertEquals(expected, ''.join(self._output_stream.output_data))
 
   def testSingleSkippedPage(self):
     test_page_set = _MakePageSet()
-    results = SummaryGtestTestResults()
+    results = page_test_results.PageTestResults(
+        progress_reporter=self._reporter)
     results.WillRunPage(test_page_set.pages[0])
     self._mock_timer.SetTime(0.007)
     results.AddValue(skip.SkipValue(test_page_set.pages[0],
@@ -87,11 +90,12 @@ class GTestTestResultsTest(
     expected = ('[ RUN      ] http://www.foo.com/\n'
                 '[       OK ] http://www.foo.com/ (7 ms)\n'
                 '[  PASSED  ] 1 test.\n\n')
-    self.assertEquals(expected, ''.join(results.output_data))
+    self.assertEquals(expected, ''.join(self._output_stream.output_data))
 
   def testPassAndFailedPages(self):
     test_page_set = _MakePageSet()
-    results = SummaryGtestTestResults()
+    results = page_test_results.PageTestResults(
+        progress_reporter=self._reporter)
     exc_info = self.CreateException()
 
     results.WillRunPage(test_page_set.pages[0])
@@ -131,11 +135,12 @@ class GTestTestResultsTest(
                 '[  FAILED  ]  http://www.bar.com/\n'
                 '[  FAILED  ]  http://www.baz.com/\n\n'
                 '2 FAILED TESTS\n\n' % (exception_trace, exception_trace))
-    self.assertEquals(expected, ''.join(results.output_data))
+    self.assertEquals(expected, ''.join(self._output_stream.output_data))
 
   def testStreamingResults(self):
     test_page_set = _MakePageSet()
-    results = SummaryGtestTestResults()
+    results = page_test_results.PageTestResults(
+        progress_reporter=self._reporter)
     exc_info = self.CreateException()
 
     results.WillRunPage(test_page_set.pages[0])
@@ -144,7 +149,7 @@ class GTestTestResultsTest(
     results.DidRunPage(test_page_set.pages[0])
     expected = ('[ RUN      ] http://www.foo.com/\n'
                 '[       OK ] http://www.foo.com/ (7 ms)\n')
-    self.assertEquals(expected, ''.join(results.output_data))
+    self.assertEquals(expected, ''.join(self._output_stream.output_data))
 
     results.WillRunPage(test_page_set.pages[1])
     self._mock_timer.SetTime(0.009)
@@ -157,5 +162,24 @@ class GTestTestResultsTest(
                 '%s\n'
                 '[  FAILED  ] http://www.bar.com/ (2 ms)\n' % exception_trace)
 
-  def tearDown(self):
-    gtest_test_results.time.time = self._real_gtest_time_time
+  def testOutputSkipInformation(self):
+    test_page_set = _MakePageSet()
+    self._reporter = gtest_progress_reporter.GTestProgressReporter(
+        self._output_stream, output_skipped_tests_summary=True)
+    results = page_test_results.PageTestResults(
+        progress_reporter=self._reporter)
+    results.WillRunPage(test_page_set.pages[0])
+    self._mock_timer.SetTime(0.007)
+    results.AddValue(skip.SkipValue(test_page_set.pages[0],
+        'Page skipped for testing reason'))
+    results.DidRunPage(test_page_set.pages[0])
+
+    results.PrintSummary()
+    expected = ('[ RUN      ] http://www.foo.com/\n'
+                '[       OK ] http://www.foo.com/ (7 ms)\n'
+                '[  PASSED  ] 1 test.\n'
+                '\n'
+                'Skipped pages:\n'
+                'http://www.foo.com/\n'
+                '\n')
+    self.assertEquals(expected, ''.join(self._output_stream.output_data))