diff options
| author | rnephew <rnephew@chromium.org> | 2016-01-26 10:56:01 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-26 18:57:18 +0000 |
| commit | b654efe47c14f8922bff8b671a7e89dd985f7820 (patch) | |
| tree | 655bb43e989047f7abe9600f695139c26fddb940 /build | |
| parent | eba065b0a6fd04a472ddd10b99c22443989a0820 (diff) | |
| download | chromium_src-b654efe47c14f8922bff8b671a7e89dd985f7820.zip chromium_src-b654efe47c14f8922bff8b671a7e89dd985f7820.tar.gz chromium_src-b654efe47c14f8922bff8b671a7e89dd985f7820.tar.bz2 | |
[Android] Fix lsusb test timeouts
BUG=
Review URL: https://codereview.chromium.org/1637543004
Cr-Commit-Position: refs/heads/master@{#371548}
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/devil/utils/lsusb_test.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build/android/devil/utils/lsusb_test.py b/build/android/devil/utils/lsusb_test.py index 7c80d6e..529a4b0 100755 --- a/build/android/devil/utils/lsusb_test.py +++ b/build/android/devil/utils/lsusb_test.py @@ -222,25 +222,25 @@ class LsusbTest(mock_calls.TestCase): def testLsusb(self): with self.assertCalls( (mock.call.devil.utils.cmd_helper.GetCmdStatusAndOutputWithTimeout( - ['lsusb'], timeout=2), (None, DEVICE_LIST)), + ['lsusb'], timeout=10), (None, DEVICE_LIST)), (mock.call.devil.utils.cmd_helper.GetCmdStatusAndOutputWithTimeout( - ['lsusb', '-v', '-s', '003:007'], timeout=2), (None, RAW_OUTPUT))): + ['lsusb', '-v', '-s', '003:007'], timeout=10), (None, RAW_OUTPUT))): self.assertDictEqual(lsusb.lsusb().pop(), EXPECTED_RESULT) def testGetSerial(self): with self.assertCalls( (mock.call.devil.utils.cmd_helper.GetCmdStatusAndOutputWithTimeout( - ['lsusb'], timeout=2), (None, DEVICE_LIST)), + ['lsusb'], timeout=10), (None, DEVICE_LIST)), (mock.call.devil.utils.cmd_helper.GetCmdStatusAndOutputWithTimeout( - ['lsusb', '-v', '-s', '003:007'], timeout=2), (None, RAW_OUTPUT))): + ['lsusb', '-v', '-s', '003:007'], timeout=10), (None, RAW_OUTPUT))): self.assertEqual(lsusb.get_android_devices(), ['01d2450ea194a93b']) def testGetLsusbSerial(self): with self.assertCalls( (mock.call.devil.utils.cmd_helper.GetCmdStatusAndOutputWithTimeout( - ['lsusb'], timeout=2), (None, DEVICE_LIST)), + ['lsusb'], timeout=10), (None, DEVICE_LIST)), (mock.call.devil.utils.cmd_helper.GetCmdStatusAndOutputWithTimeout( - ['lsusb', '-v', '-s', '003:007'], timeout=2), (None, RAW_OUTPUT))): + ['lsusb', '-v', '-s', '003:007'], timeout=10), (None, RAW_OUTPUT))): out = lsusb.lsusb().pop() self.assertEqual(lsusb.get_lsusb_serial(out), '01d2450ea194a93b') |