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

Unified Diff: build/android/pylib/instrumentation/test_runner.py

Issue 376873008: Improve Android Test Size Annotation support in test_runner.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reduce timeout to 10m Created 6 years, 5 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 | chrome/android/javatests/src/org/chromium/chrome/browser/RepostFormWarningTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cede3d2251485fdccf4a25e365a4008ca77ae5fd..4f05db6e3bf8cb05820bc503fe78f945cd49a16c 100644
--- a/build/android/pylib/instrumentation/test_runner.py
+++ b/build/android/pylib/instrumentation/test_runner.py
@@ -319,13 +319,20 @@ class TestRunner(base_test_runner.BaseTestRunner):
"""Returns the timeout in seconds for the given |test|."""
annotations = self.test_pkg.GetTestAnnotations(test)
if 'Manual' in annotations:
- return 600 * 60
+ return 10 * 60 * 60
if 'External' in annotations:
return 10 * 60
+ if 'EnormousTest' in annotations:
+ return 10 * 60
if 'LargeTest' in annotations or _PERF_TEST_ANNOTATION in annotations:
return 5 * 60
if 'MediumTest' in annotations:
return 3 * 60
+ 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))
return 1 * 60
def _RunTest(self, test, timeout):
« no previous file with comments | « no previous file | chrome/android/javatests/src/org/chromium/chrome/browser/RepostFormWarningTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698