| Index: tools/telemetry/telemetry/user_story/user_story_runner.py
|
| diff --git a/tools/telemetry/telemetry/user_story/user_story_runner.py b/tools/telemetry/telemetry/user_story/user_story_runner.py
|
| index 1f12bb37e7d3ffe43b5ab360ab6802d3eff312fd..c210352cc499cc078d0f10af89e599f3a38f4fb5 100644
|
| --- a/tools/telemetry/telemetry/user_story/user_story_runner.py
|
| +++ b/tools/telemetry/telemetry/user_story/user_story_runner.py
|
| @@ -100,7 +100,7 @@ def _RunUserStoryAndProcessErrorIfNeeded(expectations, user_story, results,
|
| except (page_test.Failure, exceptions.TimeoutException,
|
| exceptions.LoginException, exceptions.ProfilingException):
|
| ProcessError()
|
| - except exceptions.AppCrashException:
|
| + except exceptions.Error:
|
| ProcessError()
|
| raise
|
| except page_action.PageActionNotSupported as e:
|
| @@ -244,13 +244,13 @@ def Run(test, user_story_set, expectations, finder_options, results,
|
| _WaitForThermalThrottlingIfNeeded(state.platform)
|
| _RunUserStoryAndProcessErrorIfNeeded(
|
| expectations, user_story, results, state)
|
| - except exceptions.AppCrashException:
|
| - # Catch AppCrashException to give the story a chance to retry.
|
| + except exceptions.Error:
|
| + # Catch all Telemetry errors to give the story a chance to retry.
|
| # The retry is enabled by tearing down the state and creating
|
| # a new state instance in the next iteration.
|
| try:
|
| # If TearDownState raises, do not catch the exception.
|
| - # (The AppCrashException was saved as a failure value.)
|
| + # (The Error was saved as a failure value.)
|
| state.TearDownState(results)
|
| finally:
|
| # Later finally-blocks use state, so ensure it is cleared.
|
|
|