tools/telemetry/telemetry/user_story/user_story_runner.py - Issue 952693003: Telemetry: Move TimeoutException from util module to exceptions module.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/telemetry/telemetry/user_story/user_story_runner.py

Issue 952693003: Telemetry: Move TimeoutException from util module to exceptions module. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « tools/telemetry/telemetry/unittest_util/tab_test_case.py ('k') | tools/telemetry/telemetry/util/find_dependencies_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 74452c02c7c371b29d48591c5346606343c6b2a3..1f12bb37e7d3ffe43b5ab360ab6802d3eff312fd 100644

--- a/tools/telemetry/telemetry/user_story/user_story_runner.py

+++ b/tools/telemetry/telemetry/user_story/user_story_runner.py

@@ -12,7 +12,6 @@ import time

from telemetry import decorators

from telemetry import page as page_module

from telemetry.core import exceptions

-from telemetry.core import util

from telemetry.core import wpr_modes

from telemetry.page import page_set as page_set_module

from telemetry.page import page_test

@@ -98,8 +97,8 @@ def _RunUserStoryAndProcessErrorIfNeeded(expectations, user_story, results,

results.AddValue(skip_value)

return

state.RunUserStory(results)

- except (page_test.Failure, util.TimeoutException, exceptions.LoginException,

- exceptions.ProfilingException):

+ except (page_test.Failure, exceptions.TimeoutException,

+ exceptions.LoginException, exceptions.ProfilingException):

ProcessError()

except exceptions.AppCrashException:

ProcessError()