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

Unified Diff: build/android/pylib/utils/test_environment.py

Issue 2029833003: [Android] Attempt to continue on timeout in perf test runner setup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/utils/test_environment.py
diff --git a/build/android/pylib/utils/test_environment.py b/build/android/pylib/utils/test_environment.py
index 732140c33b334efc51b423199420e6a1ca8de2bd..36563c6be25cf967f3388bb70a18a44518d68962 100644
--- a/build/android/pylib/utils/test_environment.py
+++ b/build/android/pylib/utils/test_environment.py
@@ -45,7 +45,8 @@ def CleanupLeftoverProcesses(devices):
d.RestartAdbd()
d.EnableRoot()
d.WaitUntilFullyBooted()
- except device_errors.CommandFailedError:
+ except (device_errors.CommandFailedError,
+ device_errors.CommandTimeoutError):
logging.exception('Failed to clean up device. Attempting to continue.')
device_utils.DeviceUtils.parallel(devices).pMap(cleanup_device)
« 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