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

Unified Diff: build/android/pylib/gtest/test_package.py

Issue 12250010: [Android] Better handle gtest crashes that generate pexpect.EOF. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | « build/android/pylib/android_commands.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/gtest/test_package.py
diff --git a/build/android/pylib/gtest/test_package.py b/build/android/pylib/gtest/test_package.py
index dd445539487c48d6ebaa2c5ae9f65253218cf766..be153a0ddb2f8fddc57e792ab5f33b048531eb10 100644
--- a/build/android/pylib/gtest/test_package.py
+++ b/build/android/pylib/gtest/test_package.py
@@ -157,7 +157,13 @@ class TestPackage(object):
failed_tests += [BaseTestResult(full_test_name, p.before)]
except pexpect.EOF:
logging.error('Test terminated - EOF')
- raise errors.DeviceUnresponsiveError('Device may be offline')
+ # We're here because either the device went offline, or the test harness
+ # crashed without outputting the CRASHED marker (crbug.com/175538).
+ if not self.adb.IsOnline():
+ raise errors.DeviceUnresponsiveError('Device %s went offline.' %
+ self.device)
+ elif full_test_name:
+ crashed_tests += [BaseTestResult(full_test_name, p.before)]
except pexpect.TIMEOUT:
logging.error('Test terminated after %d second timeout.',
self.timeout)
« no previous file with comments | « build/android/pylib/android_commands.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698