diff options
| author | rnephew <rnephew@chromium.org> | 2016-01-25 16:11:27 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-26 00:14:50 +0000 |
| commit | f9a3154c6b6619d44ef7f9764a68014ea03ed706 (patch) | |
| tree | 21d7fbee6576153b5114f773c8a851d2e009edfa /build | |
| parent | 8071389f8e027b45339bdfd678d862799b8d6691 (diff) | |
| download | chromium_src-f9a3154c6b6619d44ef7f9764a68014ea03ed706.zip chromium_src-f9a3154c6b6619d44ef7f9764a68014ea03ed706.tar.gz chromium_src-f9a3154c6b6619d44ef7f9764a68014ea03ed706.tar.bz2 | |
[Android] Do not fail devices status check if lsusb -v times out
BUG=581159
Review URL: https://codereview.chromium.org/1635763002
Cr-Commit-Position: refs/heads/master@{#371362}
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/devil/utils/lsusb.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build/android/devil/utils/lsusb.py b/build/android/devil/utils/lsusb.py index 37bf4f2..5790a0d 100644 --- a/build/android/devil/utils/lsusb.py +++ b/build/android/devil/utils/lsusb.py @@ -87,7 +87,12 @@ def lsusb(): if m: bus_num = m.group(1) dev_num = m.group(2) - devices.append(_lsusbv_on_device(bus_num, dev_num)) + try: + devices.append(_lsusbv_on_device(bus_num, dev_num)) + except cmd_helper.TimeoutError: + # Will be blacklisted if it is in expected device file, but times out. + logging.info('lsusb -v %s:%s timed out.', bus_num, dev_num) + return devices def get_lsusb_serial(device): |