tools/telemetry/telemetry/core/backends/chrome/cros_unittest.py - Issue 969503002: Telemetry: Catch exceptions.Error instead of AppCrashException.

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/core/backends/chrome/cros_unittest.py

Issue 969503002: Telemetry: Catch exceptions.Error instead of AppCrashException. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@telemetry_make_new_exceptions4

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

Index: tools/telemetry/telemetry/core/backends/chrome/cros_unittest.py

diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_unittest.py b/tools/telemetry/telemetry/core/backends/chrome/cros_unittest.py

index aeda1d2594ef68ccff8ceb883fb857d4767c51ae..618086851695ae8bf7b3f34437e380f0dc22d679 100644

--- a/tools/telemetry/telemetry/core/backends/chrome/cros_unittest.py

+++ b/tools/telemetry/telemetry/core/backends/chrome/cros_unittest.py

@@ -62,7 +62,7 @@ class CrOSLoginTest(cros_test_case.CrOSTestCase):

extension.ExecuteJavaScript('chrome.autotestPrivate.logout();')

# TODO(chrishenry): crbug.com/450278. DevToolsClientConnectionError

# should probably be caught at a lower-level.

- except (exceptions.AppCrashException,

+ except (exceptions.Error,

devtools_http.DevToolsClientConnectionError):

achuithb 2015/03/04 00:31:15 DevToolsClientConnectionError does not inherit fro

erikchen 2015/03/04 01:14:16 Yes. I will do that in a followup CL.

pass

util.WaitFor(lambda: not self._IsCryptohomeMounted(), 20)

« no previous file with comments | « no previous file | tools/telemetry/telemetry/core/backends/chrome/misc_web_contents_backend.py » ('j') | no next file with comments »