restart adb and retry installation after timeout (#609)

dotnet · May 25, 2021 · 3a13f31 · 3a13f31
1 parent 5e628fa
commit 3a13f31
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/Microsoft.DotNet.XHarness.Android/AdbRunner.cs b/src/Microsoft.DotNet.XHarness.Android/AdbRunner.cs
@@ -234,6 +234,15 @@ public int InstallApk(string apkPath)
                 result = RunAdbCommand($"install \"{apkPath}\"");
             }
 
+            // 3. Installation timed out; restarting the ADB server helps
+            if (result.ExitCode == (int)AdbExitCodes.INSTRUMENTATION_TIMEOUT)
+            {
+                _log.LogWarning($"Installation timed out; Will make one attempt to restart ADB server, then retry the install");
+                KillAdbServer();
+                StartAdbServer();
+                result = RunAdbCommand($"install \"{apkPath}\"");
+            }
+
             if (result.ExitCode != 0)
             {
                 _log.LogError($"Error:{Environment.NewLine}{result}");