build/android/pylib/instrumentation/test_runner.py - Issue 839143002: Roll Chrome into Mojo.

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 839143002: Roll Chrome into Mojo. (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 11 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 fe444e91eff736124525fbbf34ea53f6d69cd2c6..a86b5ceae419ea3ad1be528364217220c7cb912b 100644

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

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

@@ -93,7 +93,7 @@ class TestRunner(base_test_runner.BaseTestRunner):

logging.warning('Unable to enable java asserts for %s, non rooted device',

str(self.device))

else:

- if self.device.SetJavaAsserts(True):

+ if self.device.SetJavaAsserts(self.options.set_asserts):

# TODO(jbudorick) How to best do shell restart after the

# android_commands refactor?

self.device.RunShellCommand('stop')