summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorrnephew <rnephew@chromium.org>2016-01-25 16:55:37 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-26 01:00:28 +0000
commit28de40c677ed9f82ed91f2e25c91a8c0bb243d1a (patch)
tree542dad33c4daac718fdd04037c28c71471c4527c /build
parentc6bbd67055838de0b0d70bf8881ca5429d220c3e (diff)
downloadchromium_src-28de40c677ed9f82ed91f2e25c91a8c0bb243d1a.zip
chromium_src-28de40c677ed9f82ed91f2e25c91a8c0bb243d1a.tar.gz
chromium_src-28de40c677ed9f82ed91f2e25c91a8c0bb243d1a.tar.bz2
[Android] Increase timeout for lsusb
BUG= Review URL: https://codereview.chromium.org/1632083002 Cr-Commit-Position: refs/heads/master@{#371390}
Diffstat (limited to 'build')
-rw-r--r--build/android/devil/utils/lsusb.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/android/devil/utils/lsusb.py b/build/android/devil/utils/lsusb.py
index 5790a0d..6a6213e 100644
--- a/build/android/devil/utils/lsusb.py
+++ b/build/android/devil/utils/lsusb.py
@@ -17,7 +17,7 @@ _LSUSB_GROUP_RE = re.compile(r'^ *([^ ]+.*):$')
def _lsusbv_on_device(bus_id, dev_id):
"""Calls lsusb -v on device."""
_, raw_output = cmd_helper.GetCmdStatusAndOutputWithTimeout(
- ['lsusb', '-v', '-s', '%s:%s' % (bus_id, dev_id)], timeout=2)
+ ['lsusb', '-v', '-s', '%s:%s' % (bus_id, dev_id)], timeout=10)
device = {'bus': bus_id, 'device': dev_id}
depth_stack = [device]
@@ -80,7 +80,7 @@ def _lsusbv_on_device(bus_id, dev_id):
def lsusb():
"""Call lsusb and return the parsed output."""
_, lsusb_list_output = cmd_helper.GetCmdStatusAndOutputWithTimeout(
- ['lsusb'], timeout=2)
+ ['lsusb'], timeout=10)
devices = []
for line in lsusb_list_output.splitlines():
m = _LSUSB_BUS_DEVICE_RE.match(line)