summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbudorick <jbudorick@chromium.org>2015-08-09 11:21:54 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-09 18:22:34 +0000
commit6d9a867e0e71ebaa48dbf2ed773e9f290a425614 (patch)
tree2f018376f6c453139f7447db83065b863768ded7
parent1b687be59a2646e3d1e72495a86751f1929d1a4b (diff)
downloadchromium_src-6d9a867e0e71ebaa48dbf2ed773e9f290a425614.zip
chromium_src-6d9a867e0e71ebaa48dbf2ed773e9f290a425614.tar.gz
chromium_src-6d9a867e0e71ebaa48dbf2ed773e9f290a425614.tar.bz2
[Android] Catch timeouts while listing tombstones.
See http://build.chromium.org/p/chromium.perf/builders/Android%20Nexus6%20Perf/builds/1417 BUG= TBR=sullivan@chromium.org Review URL: https://codereview.chromium.org/1279253002 Cr-Commit-Position: refs/heads/master@{#342564}
-rwxr-xr-xbuild/android/tombstones.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/android/tombstones.py b/build/android/tombstones.py
index dbfe3f7..2ff74d1 100755
--- a/build/android/tombstones.py
+++ b/build/android/tombstones.py
@@ -48,6 +48,8 @@ def _ListTombstones(device):
yield details[-1], t
except device_errors.CommandFailedError:
logging.exception('Could not retrieve tombstones.')
+ except device_errors.CommandTimeoutError:
+ logging.exception('Timed out retrieving tombstones.')
def _GetDeviceDateTime(device):