Hide ADB output during retries when installation succeeds

Co-authored-by: matouskozak <55735845+matouskozak@users.noreply.github.com>

Author: Copilot

src/Microsoft.DotNet.XHarness.Android/AdbRunner.cs

@@ -332,10 +332,17 @@ public int CopyHeadlessFolder(string testPath, bool sharedRuntime = false)
         // 2. Installation cache on device is messed up; restarting the device reliably seems to unblock this (unless the device is actually full, if so this will error the same)
         if (result.ExitCode != (int)AdbExitCodes.SUCCESS && result.StandardError.Contains(AdbDeviceFullInstallFailureMessage))
         {
-            _log.LogWarning($"It seems the package installation cache may be full on the device.  We'll try to reboot it before trying one more time.{Environment.NewLine}Output:{result}");
+            var firstAttemptResult = result;
+            _log.LogWarning($"It seems the package installation cache may be full on the device.  We'll try to reboot it before trying one more time.");
             RebootAndroidDevice();
             WaitForDevice();
             result = RunAdbCommand(new[] { "push", testPath, targetDirectory });
+            
+            // Only log the initial failure output if the retry also failed
+            if (result.ExitCode != (int)AdbExitCodes.SUCCESS)
+            {
+                _log.LogWarning($"Initial failure output:{Environment.NewLine}{firstAttemptResult}");
+            }
         }
 
         // 3. Installation timed out or failed with exception; restarting the ADB server, reboot the device and give more time for installation
@@ -392,10 +399,17 @@ public int InstallApk(string apkPath)
         // 2. Installation cache on device is messed up; restarting the device reliably seems to unblock this (unless the device is actually full, if so this will error the same)
         if (result.ExitCode != (int)AdbExitCodes.SUCCESS && result.StandardError.Contains(AdbDeviceFullInstallFailureMessage))
         {
-            _log.LogWarning($"It seems the package installation cache may be full on the device.  We'll try to reboot it before trying one more time.{Environment.NewLine}Output:{result}");
+            var firstAttemptResult = result;
+            _log.LogWarning($"It seems the package installation cache may be full on the device.  We'll try to reboot it before trying one more time.");
             RebootAndroidDevice();
             WaitForDevice();
             result = RunAdbCommand(new[] { "install", apkPath });
+            
+            // Only log the initial failure output if the retry also failed
+            if (result.ExitCode != (int)AdbExitCodes.SUCCESS)
+            {
+                _log.LogWarning($"Initial failure output:{Environment.NewLine}{firstAttemptResult}");
+            }
         }
 
         // 3. Installation timed out or failed with exception; restarting the ADB server, reboot the device and give more time for installation

tests/Microsoft.DotNet.XHarness.Android.Tests/AdbRunnerTests.cs

@@ -171,6 +171,154 @@ public void UninstallApk()
         Assert.Equal(0, exitCode);
     }
 
+    [Fact]
+    public void InstallApk_StorageFailure_SuccessfulRetry_HidesInitialOutput()
+    {
+        // Test that when installation fails due to storage but succeeds on retry,
+        // the initial failure output is NOT logged prominently
+        var logMessages = new List<string>();
+        var mockLog = new Mock<ILogger>();
+        mockLog.Setup(l => l.Log(
+            It.IsAny<LogLevel>(),
+            It.IsAny<EventId>(),
+            It.IsAny<It.IsAnyType>(),
+            It.IsAny<Exception>(),
+            It.IsAny<Func<It.IsAnyType, Exception, string>>()))
+            .Callback((LogLevel level, EventId eventId, object state, Exception exception, Delegate formatter) =>
+            {
+                logMessages.Add($"{level}: {state}");
+            });
+
+        int installAttempts = 0;
+        var mockProcessManager = new Mock<IAdbProcessManager>();
+        mockProcessManager.Setup(pm => pm.Run(
+            It.IsAny<string>(),
+            It.IsAny<IEnumerable<string>>(),
+            It.IsAny<TimeSpan>()))
+            .Returns((string p, IEnumerable<string> args, TimeSpan t) =>
+            {
+                var argsArray = args.ToArray();
+                if (argsArray.Contains("install"))
+                {
+                    installAttempts++;
+                    if (installAttempts == 1)
+                    {
+                        // First attempt: fail with storage error
+                        return new ProcessExecutionResults
+                        {
+                            ExitCode = 1,
+                            StandardError = "Failure [INSTALL_FAILED_INSUFFICIENT_STORAGE]",
+                            StandardOutput = "Failed to install APK"
+                        };
+                    }
+                    else
+                    {
+                        // Second attempt: succeed
+                        return new ProcessExecutionResults
+                        {
+                            ExitCode = 0,
+                            StandardOutput = "Success",
+                            StandardError = ""
+                        };
+                    }
+                }
+                // Handle boot completion check for WaitForDevice
+                if (argsArray.Length >= 3 && argsArray[0] == "shell" && argsArray[1] == "getprop" && argsArray[2] == "sys.boot_completed")
+                {
+                    return new ProcessExecutionResults
+                    {
+                        ExitCode = 0,
+                        StandardOutput = $"1{Environment.NewLine}",
+                        StandardError = ""
+                    };
+                }
+                // For reboot, wait-for-device, etc.
+                return new ProcessExecutionResults { ExitCode = 0, StandardOutput = "", StandardError = "" };
+            });
+
+        var runner = new AdbRunner(mockLog.Object, mockProcessManager.Object, s_adbPath);
+        string fakeApkPath = Path.Join(s_scratchAndOutputPath, $"{Path.GetRandomFileName()}.apk");
+        File.Create(fakeApkPath).Close();
+        
+        int exitCode = runner.InstallApk(fakeApkPath);
+        
+        Assert.Equal(0, exitCode);
+        Assert.Equal(2, installAttempts); // Should have retried once
+        
+        // Verify that the initial failure output is NOT in the log messages
+        // The log should contain the warning about storage, but NOT "Output:" with the full failure
+        var combinedLog = string.Join(Environment.NewLine, logMessages);
+        Assert.Contains("package installation cache may be full", combinedLog);
+        Assert.DoesNotContain("Initial failure output:", combinedLog);
+    }
+
+    [Fact]
+    public void InstallApk_StorageFailure_FailedRetry_ShowsInitialOutput()
+    {
+        // Test that when installation fails due to storage and ALSO fails on retry,
+        // the initial failure output IS logged
+        var logMessages = new List<string>();
+        var mockLog = new Mock<ILogger>();
+        mockLog.Setup(l => l.Log(
+            It.IsAny<LogLevel>(),
+            It.IsAny<EventId>(),
+            It.IsAny<It.IsAnyType>(),
+            It.IsAny<Exception>(),
+            It.IsAny<Func<It.IsAnyType, Exception, string>>()))
+            .Callback((LogLevel level, EventId eventId, object state, Exception exception, Delegate formatter) =>
+            {
+                logMessages.Add($"{level}: {state}");
+            });
+
+        int installAttempts = 0;
+        var mockProcessManager = new Mock<IAdbProcessManager>();
+        mockProcessManager.Setup(pm => pm.Run(
+            It.IsAny<string>(),
+            It.IsAny<IEnumerable<string>>(),
+            It.IsAny<TimeSpan>()))
+            .Returns((string p, IEnumerable<string> args, TimeSpan t) =>
+            {
+                var argsArray = args.ToArray();
+                if (argsArray.Contains("install"))
+                {
+                    installAttempts++;
+                    // Both attempts fail with storage error
+                    return new ProcessExecutionResults
+                    {
+                        ExitCode = 1,
+                        StandardError = "Failure [INSTALL_FAILED_INSUFFICIENT_STORAGE]",
+                        StandardOutput = "Failed to install APK"
+                    };
+                }
+                // Handle boot completion check for WaitForDevice
+                if (argsArray.Length >= 3 && argsArray[0] == "shell" && argsArray[1] == "getprop" && argsArray[2] == "sys.boot_completed")
+                {
+                    return new ProcessExecutionResults
+                    {
+                        ExitCode = 0,
+                        StandardOutput = $"1{Environment.NewLine}",
+                        StandardError = ""
+                    };
+                }
+                // For reboot, wait-for-device, etc.
+                return new ProcessExecutionResults { ExitCode = 0, StandardOutput = "", StandardError = "" };
+            });
+
+        var runner = new AdbRunner(mockLog.Object, mockProcessManager.Object, s_adbPath);
+        string fakeApkPath = Path.Join(s_scratchAndOutputPath, $"{Path.GetRandomFileName()}.apk");
+        File.Create(fakeApkPath).Close();
+        
+        int exitCode = runner.InstallApk(fakeApkPath);
+        
+        Assert.NotEqual(0, exitCode);
+        Assert.Equal(2, installAttempts); // Should have retried once
+        
+        // Verify that the initial failure output IS in the log messages
+        var combinedLog = string.Join(Environment.NewLine, logMessages);
+        Assert.Contains("Initial failure output:", combinedLog);
+        Assert.Contains("INSTALL_FAILED_INSUFFICIENT_STORAGE", combinedLog);
+    }
+
     [Fact]
     public void KillApk()
     {