Merge "adb: fix timeout-related test flakiness."
This commit is contained in:
commit
fe1eba0056
2 changed files with 3 additions and 3 deletions
|
@ -1149,7 +1149,7 @@ static bool adb_root(const char* command) {
|
|||
// If we were using a specific transport ID, there's nothing we can wait for.
|
||||
if (previous_id == 0) {
|
||||
adb_set_transport(previous_type, previous_serial, 0);
|
||||
wait_for_device("wait-for-device", 6000ms);
|
||||
wait_for_device("wait-for-device", 12000ms);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
|
@ -129,8 +129,8 @@ class ReconnectHandler {
|
|||
};
|
||||
|
||||
// Only retry for up to one minute.
|
||||
static constexpr const std::chrono::seconds kDefaultTimeout = 10s;
|
||||
static constexpr const size_t kMaxAttempts = 6;
|
||||
static constexpr const std::chrono::seconds kDefaultTimeout = 3s;
|
||||
static constexpr const size_t kMaxAttempts = 20;
|
||||
|
||||
// Protects all members.
|
||||
std::mutex reconnect_mutex_;
|
||||
|
|
Loading…
Reference in a new issue