commit 4d5f60807f1958bb61d47b6c3e129fa88076da4c
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jul 27 14:14:57 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 27 14:14:57 2021 +0000
tree 6f2eea460a152d44e6c29655953efb2b34137696
parent 354b624867969519f78d0fb090bf293a88653001
parent c0ca3ef60bc4fb36e38711dfd0f0e97c050f359c

Merge "Re-connect adb while cleaning up VM."

tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java

diff --git a/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java b/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java
index 40debba..a9e5040 100644
--- a/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java
+++ b/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java
@@ -70,6 +70,14 @@
         // disconnect from microdroid
         tryRunOnHost("adb", "disconnect", MICRODROID_SERIAL);
 
+        // Make sure we're connected to the host adb again (b/194219111)
+        for (int retry = 0; retry < 3; ++retry) {
+            if (android.tryRun("true") != null) {
+                break;
+            }
+            androidDevice.waitForDeviceOnline(1000);
+        }
+
         // kill stale VMs and directories
         android.tryRun("killall", "crosvm");
         android.tryRun("rm", "-rf", "/data/misc/virtualizationservice/*");