Index: tools/telemetry/telemetry/page/gtest_test_results.py
|
diff --git a/tools/telemetry/telemetry/page/gtest_test_results.py b/tools/telemetry/telemetry/page/gtest_test_results.py
|
index 31e85f9c686f19ff3fadd460b0ef6e4b6f713725..7dd25226c5e7584ae986a2e3916ccc2843aa77c6 100644
|
--- a/tools/telemetry/telemetry/page/gtest_test_results.py
|
+++ b/tools/telemetry/telemetry/page/gtest_test_results.py
|
@@ -9,13 +9,13 @@ import unittest
|
from telemetry.page import page_test_results
|
|
class GTestTestResults(page_test_results.PageTestResults):
|
- def __init__(self):
|
+ def __init__(self, output_stream):
|
super(GTestTestResults, self).__init__()
|
- self.timestamp = None
|
- self.num_successes = 0
|
+ self._output_stream = output_stream
|
+ self._timestamp = None
|
|
def _GetMs(self):
|
- return (time.time() - self.timestamp) * 1000
|
+ return (time.time() - self._timestamp) * 1000
|
|
@property
|
def num_errors(self):
|
@@ -30,46 +30,51 @@ class GTestTestResults(page_test_results.PageTestResults):
|
return str(test)
|
|
def _emitFailure(self, test, err):
|
- print self._exc_info_to_string(err, test)
|
+ print >> self._output_stream, self._exc_info_to_string(err, test)
|
test_name = GTestTestResults._formatTestname(test)
|
- print '[ FAILED ]', test_name, '(%0.f ms)' % self._GetMs()
|
+ print >> self._output_stream, '[ FAILED ]', test_name, (
|
+ '(%0.f ms)' % self._GetMs())
|
sys.stdout.flush()
|
|
def addError(self, test, err):
|
- self._emitFailure(test, err)
|
super(GTestTestResults, self).addError(test, err)
|
+ self._emitFailure(test, err)
|
|
def addFailure(self, test, err):
|
- self._emitFailure(test, err)
|
super(GTestTestResults, self).addFailure(test, err)
|
+ self._emitFailure(test, err)
|
|
def startTest(self, test):
|
- print '[ RUN ]', GTestTestResults._formatTestname(test)
|
- sys.stdout.flush()
|
- self.timestamp = time.time()
|
super(GTestTestResults, self).startTest(test)
|
+ print >> self._output_stream, '[ RUN ]', (
|
+ GTestTestResults._formatTestname(test))
|
+ sys.stdout.flush()
|
+ self._timestamp = time.time()
|
|
def addSuccess(self, test):
|
- self.num_successes = self.num_successes + 1
|
+ super(GTestTestResults, self).addSuccess(test)
|
test_name = GTestTestResults._formatTestname(test)
|
- print '[ OK ]', test_name, '(%0.f ms)' % self._GetMs()
|
+ print >> self._output_stream, '[ OK ]', test_name, (
|
+ '(%0.f ms)' % self._GetMs())
|
sys.stdout.flush()
|
- super(GTestTestResults, self).addSuccess(test)
|
|
def PrintSummary(self):
|
- unit = 'test' if self.num_successes == 1 else 'tests'
|
- print '[ PASSED ] %d %s.' % (self.num_successes, unit)
|
+ unit = 'test' if len(self.successes) == 1 else 'tests'
|
+ print >> self._output_stream, '[ PASSED ]', (
|
+ '%d %s.' % (len(self.successes), unit))
|
if self.errors or self.failures:
|
all_errors = self.errors[:]
|
all_errors.extend(self.failures)
|
unit = 'test' if len(all_errors) == 1 else 'tests'
|
- print '[ FAILED ] %d %s, listed below:' % (len(all_errors), unit)
|
+ print >> self._output_stream, '[ FAILED ]', (
|
+ '%d %s, listed below:' % (len(all_errors), unit))
|
for test, _ in all_errors:
|
- print '[ FAILED ] ', GTestTestResults._formatTestname(test)
|
+ print >> self._output_stream, '[ FAILED ] ', (
|
+ GTestTestResults._formatTestname(test))
|
if not self.wasSuccessful():
|
- print
|
+ print >> self._output_stream
|
count = len(self.errors) + len(self.failures)
|
unit = 'TEST' if count == 1 else 'TESTS'
|
- print '%d FAILED %s' % (count, unit)
|
- print
|
+ print >> self._output_stream, '%d FAILED %s' % (count, unit)
|
+ print >> self._output_stream
|
sys.stdout.flush()
|
|