tools/telemetry/telemetry/page/page_runner.py - Issue 385653002: [Android] Fix a deadlock between telemetry and DeviceUtils.

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/page/page_runner.py

Issue 385653002: [Android] Fix a deadlock between telemetry and DeviceUtils. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 5 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/page/page_runner.py

diff --git a/tools/telemetry/telemetry/page/page_runner.py b/tools/telemetry/telemetry/page/page_runner.py

index 3382557fb2dbbc5695e662592313776c286e0af2..454ac158406992d1c0799fb579231670cf777dce 100644

--- a/tools/telemetry/telemetry/page/page_runner.py

+++ b/tools/telemetry/telemetry/page/page_runner.py

@@ -277,7 +277,7 @@ def _PrepareAndRunPage(test, page_set, expectations, finder_options,

logging.error('Aborting multi-tab test after tab %s crashed',

page.url)

raise

- logging.warning(e)

+ logging.warning(str(e))

state.StopBrowser()

if finder_options.profiler:

@@ -301,7 +301,7 @@ def _PrepareAndRunPage(test, page_set, expectations, finder_options,

if test.is_multi_tab_test:

logging.error('Aborting multi-tab test after browser crashed')

raise

- logging.warning(e)

+ logging.warning(str(e))

def _UpdatePageSetArchivesIfChanged(page_set):

« no previous file with comments | « no previous file | no next file » | no next file with comments »