adb: fix timeout-related test flakiness.
When running tests against cuttlefish, `adb root` sometimes flakes because of a 6 second timeout in wait_for_device, which can get triggered when adbd's restart gets throttled by init. The adb client would notice that the socket went down, try to reconnect and fail because adbd still hasn't started yet, and then wait up to 10 seconds to reconnect, before which the `adb root` invocation would have failed due to timeout. Increase the timeout to be long enough to handle this, and also reduce the interval of reconnections to speed things up when we're in this scenario. Bug: http://b/170707786 Test: while true; do adb root; adb wait-for-device; adb unroot; adb wait-for-device; done Change-Id: I140d721dfcfd635d45813a55990684a25e32228c
Loading
Please register or sign in to comment