commit fe1eba005603157f376829ffb0b9d26a0813cb8c
author Josh Gao <jmgao@google.com> Fri Oct 16 20:18:45 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 16 20:18:45 2020 +0000
tree 8c4616d769d4ebe924cdc98fc66a5aa67fd68b3d
parent ac46ab3c9304fe7d4f01a10b7138c6405085c158
parent 1115e29faf1d9a1ed49c3e5744d59675c5d58410

Merge "adb: fix timeout-related test flakiness."

adb/client/commandline.cpp

diff --git a/adb/client/commandline.cpp b/adb/client/commandline.cpp
index 43772ba..d9e69f7 100644
--- a/adb/client/commandline.cpp
+++ b/adb/client/commandline.cpp
@@ -1149,7 +1149,7 @@
     // 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;

adb/transport.cpp

diff --git a/adb/transport.cpp b/adb/transport.cpp
index c33d5af..93b4618 100644
--- a/adb/transport.cpp
+++ b/adb/transport.cpp
@@ -129,8 +129,8 @@
     };
 
     // 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_;