Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Unified Diff: build/android/pylib/remote/device/remote_device_environment.py

Issue 1427683002: [Android] Add option to override test in-progress timeout for amp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/android/test_runner.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/remote/device/remote_device_environment.py
diff --git a/build/android/pylib/remote/device/remote_device_environment.py b/build/android/pylib/remote/device/remote_device_environment.py
index 7730a9841d199c48e01844cab979a1ff427b8709..7923f3ade13d5f8170481f884050b8321470426a 100644
--- a/build/android/pylib/remote/device/remote_device_environment.py
+++ b/build/android/pylib/remote/device/remote_device_environment.py
@@ -124,6 +124,8 @@ class RemoteDeviceEnvironment(environment.Environment):
self._runner_package, args.runner_package, 'runner_package')
self._runner_type = command_line_override(
self._runner_type, args.runner_type, 'runner_type')
+ self._timeouts["in-progress"] = command_line_override(
+ self._timeouts["in-progress"], args.test_timeout, 'test_timeout')
if args.api_key_file:
with open(args.api_key_file) as api_key_file:
« no previous file with comments | « no previous file | build/android/test_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698