commit 42f2a9aae4edac3df988cf1093befc3b01b547b9
author Josh Gao <jmgao@google.com> Thu Feb 07 22:02:57 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Feb 07 22:02:57 2019 -0800
tree 265b3942136a1f04e959995c5951b8e02e1d4afe
parent d912535b9eb17200a11145b9cbaf67d145e3ec2c
parent 2a5932ee4b64466d8f658ad150b2e86abce81631

Merge "adb: hopefully deflake test_adb.py." am: 151499e47e am: ad68f429ca
am: 001adec269

Change-Id: Ifb02659531eae0b7aaadb3b54bb8d02e33b2295c

adb/test_adb.py

diff --git a/adb/test_adb.py b/adb/test_adb.py
index 430fc3d..14e5071 100755
--- a/adb/test_adb.py
+++ b/adb/test_adb.py
@@ -422,6 +422,9 @@
         with fake_adbd() as (port, _):
             serial = "localhost:{}".format(port)
             with adb_connect(self, serial):
+                # Wait a bit to give adb some time to connect.
+                time.sleep(0.25)
+
                 output = subprocess.check_output(["adb", "-s", serial,
                                                   "get-state"])
                 self.assertEqual(output.strip(), b"device")