tools/telemetry/telemetry/core/backends/chrome/chrome_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/chrome_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/perf/profile_creators/fast_navigation_profile_extender.py ('k') | tools/telemetry/telemetry/core/backends/chrome/cros_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/chrome_browser_backend.py

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

index 3513eba5c668a10e76e560b45e00499fe41f1b1f..31f89b76392753c9de641abb23aba2b3ee629f0a 100644

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

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

@@ -189,7 +189,7 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend):

""" Wait for browser to come up. """

try:

util.WaitFor(self.HasBrowserFinishedLaunching, timeout=30)

- except (util.TimeoutException, exceptions.ProcessGoneException) as e:

+ except (exceptions.TimeoutException, exceptions.ProcessGoneException) as e:

if not self.IsBrowserRunning():

raise exceptions.BrowserGoneException(self.browser, e)

raise exceptions.BrowserConnectionGoneException(self.browser, e)

@@ -204,7 +204,7 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend):

'Waiting for extensions required devtool client to be initiated first')

try:

util.WaitFor(self._AllExtensionsLoaded, timeout=60)

- except util.TimeoutException:

+ except exceptions.TimeoutException:

logging.error('ExtensionsToLoad: ' +

repr([e.extension_id for e in self._extensions_to_load]))

logging.error('Extension list: ' +