build/android/pylib/instrumentation/test_runner.py - Issue 812543002: Update from https://crrev.com/308331

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 812543002: Update from https://crrev.com/308331 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years 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 92d80f97f145362d66272433be5a3ccbfd0b0932..fe444e91eff736124525fbbf34ea53f6d69cd2c6 100644

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

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

@@ -299,8 +299,8 @@ class TestRunner(base_test_runner.BaseTestRunner):

if 'SmallTest' in annotations:

return 1 * 60

- logging.warn(("Test size not found in annotations for test '{0}', using " +

- "1 minute for timeout.").format(test))

+ logging.warn(("Test size not found in annotations for test '%s', using " +

+ "1 minute for timeout.") % test)

return 1 * 60

def _RunTest(self, test, timeout):

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

timeout = (self._GetIndividualTestTimeoutSecs(test) *

self._GetIndividualTestTimeoutScale(test) *

self.tool.GetTimeoutScale())

- if (self.device.GetProp('ro.build.version.sdk')

+ if (self.device.build_version_sdk

< constants.ANDROID_SDK_VERSION_CODES.JELLY_BEAN):

timeout *= 10