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 c1343260c772cb669c1b4a147f7156e54aa101f6..e28c795522244076ca603b0e96adea4a15371d4e 100644 |
--- a/build/android/pylib/instrumentation/test_runner.py |
+++ b/build/android/pylib/instrumentation/test_runner.py |
@@ -306,9 +306,13 @@ class TestRunner(base_test_runner.BaseTestRunner): |
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): |