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

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

Issue 16867002: [Android] Log the timeout used for each instrumentation test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | no next file » | 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 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):
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698