| Index: tools/telemetry/telemetry/page/page_runner.py
|
| diff --git a/tools/telemetry/telemetry/page/page_runner.py b/tools/telemetry/telemetry/page/page_runner.py
|
| index 0d20fd8a91157831cca3a1dd181b9f323f54aed4..972ca12da9f0a7ded9d1322f9f62b2e9db9b0061 100644
|
| --- a/tools/telemetry/telemetry/page/page_runner.py
|
| +++ b/tools/telemetry/telemetry/page/page_runner.py
|
| @@ -102,7 +102,7 @@ def _RunPageAndHandleExceptionIfNeeded(test, page_set, expectations,
|
| ProcessError()
|
| except (exceptions.TabCrashException, exceptions.BrowserGoneException):
|
| ProcessError()
|
| - state.TearDown()
|
| + state.TearDown(results)
|
| if test.is_multi_tab_test:
|
| logging.error('Aborting multi-tab test after browser or tab crashed at '
|
| 'page %s' % page.url)
|
| @@ -199,7 +199,7 @@ def Run(test, page_set, expectations, finder_options, results):
|
| # Tear down & restart the state for unhandled exceptions thrown by
|
| # _RunPageAndHandleExceptionIfNeeded.
|
| results.AddValue(failure.FailureValue(page, sys.exc_info()))
|
| - state.TearDown()
|
| + state.TearDown(results)
|
| state = shared_page_state.SharedPageState(test, finder_options)
|
| finally:
|
| _CheckThermalThrottling(state.platform)
|
| @@ -212,8 +212,7 @@ def Run(test, page_set, expectations, finder_options, results):
|
| logging.error('Too many failures. Aborting.')
|
| test.RequestExit()
|
| finally:
|
| - test.DidRunTest(state.browser, results)
|
| - state.TearDown()
|
| + state.TearDown(results)
|
|
|
|
|
| def _ShuffleAndFilterPageSet(page_set, finder_options):
|
|
|