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

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

Patch Set: Created 5 years, 7 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 6e8be3419b8fbe17969885e3989ca024e35e8b38..d1c5a4d6bc396e5a83523ca705b4cee57101154d 100644

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

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

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

timeout = (self._GetIndividualTestTimeoutSecs(test) *

self._GetIndividualTestTimeoutScale(test) *

self.tool.GetTimeoutScale())

- if (self.device.build_version_sdk

- < constants.ANDROID_SDK_VERSION_CODES.JELLY_BEAN):

- timeout *= 10

start_ms = 0

duration_ms = 0