Improve Android Test Size Annotation support in test_runner.py

build/android/pylib/instrumentation/test_runner.py

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..e0985f8bf745d3e8825c0734fb52edbecb2bc7b6 100644
--- a/build/android/pylib/instrumentation/test_runner.py
+++ b/build/android/pylib/instrumentation/test_runner.py
@@ -318,14 +318,21 @@ class TestRunner(base_test_runner.BaseTestRunner):
   def _GetIndividualTestTimeoutSecs(self, test):
     """Returns the timeout in seconds for the given |test|."""
     annotations = self.test_pkg.GetTestAnnotations(test)
+    if 'EnormousTest' in annotations:
+      return 24 * 60 * 60

[jbudorick, 2014/07/09 01:31:53]

I think that 24 hours might be a little much. While EnormousTests should
absolutely have a longer timeout than LargeTests, I think something between 10
minutes and 1 hour would be more reasonable.

[gone, 2014/07/09 17:26:56]

Setting a single test timeout to 24 hours would result in that bot being
completely useless; too many CLs land in a day to do any bisecting on test
regressions.  I'd suggest 10-30 minutes, max.

[Yaron, 2014/07/09 20:47:41]

Agreed. Did you have a test in mind that needs longer than 10 mins?

     if 'Manual' in annotations:
-      return 600 * 60
+      return 10 * 60 * 60
     if 'External' 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):