| Index: tools/telemetry/telemetry/results/gtest_test_results_unittest.py
|
| diff --git a/tools/telemetry/telemetry/results/gtest_test_results_unittest.py b/tools/telemetry/telemetry/results/gtest_test_results_unittest.py
|
| index 2013a237bb9f36bd6265993ac5601315ffea4bb8..a77f76fc9ad26508fd8dc5bc17700d3a543e68f8 100644
|
| --- a/tools/telemetry/telemetry/results/gtest_test_results_unittest.py
|
| +++ b/tools/telemetry/telemetry/results/gtest_test_results_unittest.py
|
| @@ -8,6 +8,7 @@ from telemetry.page import page_set
|
| from telemetry.results import base_test_results_unittest
|
| from telemetry.results import gtest_test_results
|
| from telemetry.unittest import simple_mock
|
| +from telemetry.value import failure
|
|
|
|
|
| def _MakePageSet():
|
| @@ -56,10 +57,10 @@ class GTestTestResultsTest(
|
|
|
| results = SummaryGtestTestResults()
|
| results.StartTest(test_page_set.pages[0])
|
| - exception = self.CreateException()
|
| - results.AddFailure(test_page_set.pages[0], exception)
|
| + exc_info = self.CreateException()
|
| + results.AddValue(failure.FailureValue(test_page_set.pages[0], exc_info))
|
| results.PrintSummary()
|
| - exception_trace = ''.join(traceback.format_exception(*exception))
|
| + exception_trace = ''.join(traceback.format_exception(*exc_info))
|
| expected = ('[ RUN ] http://www.foo.com/\n'
|
| '%s\n'
|
| '[ FAILED ] http://www.foo.com/ (0 ms)\n'
|
| @@ -84,7 +85,7 @@ class GTestTestResultsTest(
|
| def testPassAndFailedPages(self):
|
| test_page_set = _MakePageSet()
|
| results = SummaryGtestTestResults()
|
| - exception = self.CreateException()
|
| + exc_info = self.CreateException()
|
|
|
| results.StartTest(test_page_set.pages[0])
|
| self._mock_timer.SetTime(0.007)
|
| @@ -92,18 +93,18 @@ class GTestTestResultsTest(
|
|
|
| results.StartTest(test_page_set.pages[1])
|
| self._mock_timer.SetTime(0.009)
|
| - results.AddFailure(test_page_set.pages[1], exception)
|
| + results.AddValue(failure.FailureValue(test_page_set.pages[1], exc_info))
|
|
|
| results.StartTest(test_page_set.pages[2])
|
| self._mock_timer.SetTime(0.015)
|
| - results.AddFailure(test_page_set.pages[2], exception)
|
| + results.AddValue(failure.FailureValue(test_page_set.pages[2], exc_info))
|
|
|
| results.StartTest(test_page_set.pages[3])
|
| self._mock_timer.SetTime(0.020)
|
| results.AddSuccess(test_page_set.pages[3])
|
|
|
| results.PrintSummary()
|
| - exception_trace = ''.join(traceback.format_exception(*exception))
|
| + exception_trace = ''.join(traceback.format_exception(*exc_info))
|
| expected = ('[ RUN ] http://www.foo.com/\n'
|
| '[ OK ] http://www.foo.com/ (7 ms)\n'
|
| '[ RUN ] http://www.bar.com/\n'
|
| @@ -124,7 +125,7 @@ class GTestTestResultsTest(
|
| def testStreamingResults(self):
|
| test_page_set = _MakePageSet()
|
| results = SummaryGtestTestResults()
|
| - exception = self.CreateException()
|
| + exc_info = self.CreateException()
|
|
|
| results.StartTest(test_page_set.pages[0])
|
| self._mock_timer.SetTime(0.007)
|
| @@ -135,8 +136,8 @@ class GTestTestResultsTest(
|
|
|
| results.StartTest(test_page_set.pages[1])
|
| self._mock_timer.SetTime(0.009)
|
| - exception_trace = ''.join(traceback.format_exception(*exception))
|
| - results.AddFailure(test_page_set.pages[1], exception)
|
| + exception_trace = ''.join(traceback.format_exception(*exc_info))
|
| + results.AddValue(failure.FailureValue(test_page_set.pages[1], exc_info))
|
| expected = ('[ RUN ] http://www.foo.com/\n'
|
| '[ OK ] http://www.foo.com/ (7 ms)\n'
|
| '[ RUN ] http://www.bar.com/\n'
|
|
|