| Index: tools/telemetry/telemetry/results/gtest_test_results.py
|
| diff --git a/tools/telemetry/telemetry/results/gtest_test_results.py b/tools/telemetry/telemetry/results/gtest_test_results.py
|
| index 2764ed9b436d678fb26f03014c0a451e97cd8cda..5f30a7b141c4790db1e3ae578c5944b9b9155cc5 100644
|
| --- a/tools/telemetry/telemetry/results/gtest_test_results.py
|
| +++ b/tools/telemetry/telemetry/results/gtest_test_results.py
|
| @@ -5,7 +5,6 @@
|
| import logging
|
| import sys
|
| import time
|
| -import unittest
|
|
|
| from telemetry.results import page_test_results
|
|
|
| @@ -22,46 +21,37 @@ class GTestTestResults(page_test_results.PageTestResults):
|
| def num_errors(self):
|
| return len(self.errors) + len(self.failures)
|
|
|
| - @staticmethod
|
| - def _formatTestname(test):
|
| - if isinstance(test, unittest.TestCase):
|
| - chunks = test.id().split('.')[2:]
|
| - return '.'.join(chunks)
|
| - else:
|
| - return str(test)
|
| -
|
| - def _emitFailure(self, test, err):
|
| - print >> self._output_stream, self._exc_info_to_string(err, test)
|
| - test_name = GTestTestResults._formatTestname(test)
|
| - print >> self._output_stream, '[ FAILED ]', test_name, (
|
| + def _emitFailure(self, page, err):
|
| + print >> self._output_stream, self._GetStringFromExcInfo(err)
|
| + print >> self._output_stream, '[ FAILED ]', page.display_name, (
|
| '(%0.f ms)' % self._GetMs())
|
| sys.stdout.flush()
|
|
|
| - def addError(self, test, err):
|
| - super(GTestTestResults, self).addError(test, err)
|
| - self._emitFailure(test, err)
|
| + def AddError(self, page, err):
|
| + super(GTestTestResults, self).AddError(page, err)
|
| + self._emitFailure(page, err)
|
|
|
| - def addFailure(self, test, err):
|
| - super(GTestTestResults, self).addFailure(test, err)
|
| - self._emitFailure(test, err)
|
| + def AddFailure(self, page, err):
|
| + super(GTestTestResults, self).AddFailure(page, err)
|
| + self._emitFailure(page, err)
|
|
|
| - def startTest(self, test):
|
| - super(GTestTestResults, self).startTest(test)
|
| + def StartTest(self, page):
|
| + super(GTestTestResults, self).StartTest(page)
|
| print >> self._output_stream, '[ RUN ]', (
|
| - GTestTestResults._formatTestname(test))
|
| + page.display_name)
|
| sys.stdout.flush()
|
| self._timestamp = time.time()
|
|
|
| - def addSuccess(self, test):
|
| - super(GTestTestResults, self).addSuccess(test)
|
| - test_name = GTestTestResults._formatTestname(test)
|
| + def AddSuccess(self, page):
|
| + super(GTestTestResults, self).AddSuccess(page)
|
| + test_name = page.display_name
|
| print >> self._output_stream, '[ OK ]', test_name, (
|
| '(%0.f ms)' % self._GetMs())
|
| sys.stdout.flush()
|
|
|
| - def addSkip(self, test, reason):
|
| - super(GTestTestResults, self).addSkip(test, reason)
|
| - test_name = GTestTestResults._formatTestname(test)
|
| + def AddSkip(self, page, reason):
|
| + super(GTestTestResults, self).AddSkip(page, reason)
|
| + test_name = page.display_name
|
| logging.warning('===== SKIPPING TEST %s: %s =====', test_name, reason)
|
| if self._timestamp == None:
|
| self._timestamp = time.time()
|
| @@ -79,10 +69,9 @@ class GTestTestResults(page_test_results.PageTestResults):
|
| unit = 'test' if len(all_errors) == 1 else 'tests'
|
| print >> self._output_stream, '[ FAILED ]', (
|
| '%d %s, listed below:' % (len(all_errors), unit))
|
| - for test, _ in all_errors:
|
| + for page, _ in all_errors:
|
| print >> self._output_stream, '[ FAILED ] ', (
|
| - GTestTestResults._formatTestname(test))
|
| - if not self.wasSuccessful():
|
| + page.display_name)
|
| print >> self._output_stream
|
| count = len(self.errors) + len(self.failures)
|
| unit = 'TEST' if count == 1 else 'TESTS'
|
|
|