build/android/pylib/instrumentation/instrumentation_test_instance.py - Issue 1493953002: [Android] Add support for timeouts scaling for OnDevice instrumentation.

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/instrumentation_test_instance.py

Issue 1493953002: [Android] Add support for timeouts scaling for OnDevice instrumentation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added wrong GN dependency. Created 5 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « base/test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java ('k') | testing/android/driver/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4536f6e74b5ddc672a6ac81869616073c934e2ad..b13fdb28f3400c07175e9010f90d207d3116bdb2 100644

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

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

@@ -44,6 +44,9 @@ _EXTRA_DRIVER_TARGET_PACKAGE = (

'org.chromium.test.driver.OnDeviceInstrumentationDriver.TargetPackage')

_EXTRA_DRIVER_TARGET_CLASS = (

'org.chromium.test.driver.OnDeviceInstrumentationDriver.TargetClass')

+_EXTRA_TIMEOUT_SCALE = (

+ 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TimeoutScale')

_PARAMETERIZED_TEST_ANNOTATION = 'ParameterizedTest'

_PARAMETERIZED_TEST_SET_ANNOTATION = 'ParameterizedTest$Set'

_NATIVE_CRASH_RE = re.compile('native crash', re.IGNORECASE)

@@ -606,6 +609,7 @@ class InstrumentationTestInstance(test_instance.TestInstance):

env = {

_EXTRA_DRIVER_TARGET_PACKAGE: self.test_package,

_EXTRA_DRIVER_TARGET_CLASS: self.test_runner,

+ _EXTRA_TIMEOUT_SCALE: self._timeout_scale,

}

if test_list: