build/android/pylib/instrumentation/test_runner.py - Issue 1222313015: Manual partial update from from https://crrev.com/337502

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: build/android/pylib/instrumentation/test_runner.py

Issue 1222313015: Manual partial update from from https://crrev.com/337502 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 5 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:

Index: build/android/pylib/instrumentation/test_runner.py

diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py

index 4ca0742c36b03a88bea144b7a7dfc69001e612ae..0f2e53fea733e032314bf5cee7ccd6d711e3df3b 100644

--- a/build/android/pylib/instrumentation/test_runner.py

+++ b/build/android/pylib/instrumentation/test_runner.py

@@ -343,6 +343,11 @@ class TestRunner(base_test_runner.BaseTestRunner):

try:

self.TestSetup(test)

+ try:

+ self.device.GoHome()

+ except device_errors.CommandTimeoutError:

+ logging.exception('Failed to focus the launcher.')

time_ms = lambda: int(time.time() * 1000)

start_ms = time_ms()

raw_output = self._RunTest(test, timeout)