build/android/pylib/instrumentation/test_runner.py - Issue 670183003: Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

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 670183003: Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 2 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 821fec1f2a8c28e2d69d8621838149b904808c5b..aa0a2c06a581f64fe58c33e45421554edc0ff994 100644

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

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

@@ -487,6 +487,9 @@ class TestRunner(base_test_runner.BaseTestRunner):

timeout = (self._GetIndividualTestTimeoutSecs(test) *

self._GetIndividualTestTimeoutScale(test) *

self.tool.GetTimeoutScale())

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

+ < constants.ANDROID_SDK_VERSION_CODES.JELLY_BEAN):

+ timeout *= 4

start_ms = 0

duration_ms = 0

« no previous file with comments | « build/android/pylib/device_settings.py ('k') | build/android/rezip.gyp » ('j') | no next file with comments »