[Android] Log the timeout used for each instrumentation test.

build/android/pylib/instrumentation/test_runner.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Class for running instrumentation tests on a single device."""
 
 import logging
 import os
 import re
 import shutil
@@ skipping 288 matching lines @@
       return 600 * 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
     return 1 * 60
 
   def _RunTest(self, test, timeout):
-    return self.adb.RunInstrumentationTest(
-        test, self.test_pkg.GetPackageName(),
-        self._GetInstrumentationArgs(), timeout)
+    try:
+      return self.adb.RunInstrumentationTest(
+          test, self.test_pkg.GetPackageName(),
+          self._GetInstrumentationArgs(), timeout)
+    except android_commands.errors.WaitForResponseTimedOutError:
+      logging.info('Ran the test with timeout of %ds.' % timeout)
+      raise
 
   #override
   def RunTest(self, test):
     raw_result = None
     start_date_ms = None
     results = base_test_result.TestRunResults()
     timeout=(self._GetIndividualTestTimeoutSecs(test) *
              self._GetIndividualTestTimeoutScale(test) *
              self.tool.GetTimeoutScale())
     try:
@@ skipping 27 matching lines @@
         duration_ms = 0
       message = str(e)
       if not message:
         message = 'No information.'
       results.AddResult(test_result.InstrumentationTestResult(
           test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms,
           log=message))
       raw_result = None
     self.TestTeardown(test, raw_result)
     return (results, None if results.DidRunPass() else test)