tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.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/core/backends/chrome/desktop_browser_backend.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/core/backends/chrome/cros_browser_backend.py ('k') | tools/telemetry/telemetry/core/backends/chrome/ios_browser_backend.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 0b4d5e209f2e9adfd23989e8d88e5916cdb0759d..1f0620cc7da2f1c16ff38e0d003de5d022a2ec57 100644

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

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

@@ -369,7 +369,7 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):

try:

util.WaitFor(lambda: not self.IsBrowserRunning(), timeout=5)

logging.info('Successfully shut down browser cooperatively')

- except util.TimeoutException as e:

+ except exceptions.TimeoutException as e:

logging.warning('Failed to cooperatively shutdown. ' +

'Proceeding to terminate: ' + str(e))

@@ -385,7 +385,7 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):

try:

util.WaitFor(lambda: not self.IsBrowserRunning(), timeout=5)

self._proc = None

- except util.TimeoutException:

+ except exceptions.TimeoutException:

logging.warning('Failed to gracefully shutdown. Proceeding to kill.')

# Shutdown aggressively if the above failed or if the profile is temporary.