From f74f68df2a9daecf289071fd822d3e273e4225bd Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 17 Apr 2026 09:52:40 +0000
Subject: [PATCH 1/4] Fix flaky Kill_Test: add WaitForExit after Kill before
 asserting HasExited

Agent-Logs-Url: https://github.com/Tyrrrz/PolyShim/sessions/8eb94b3f-07a5-467b-bd65-c50c6b172da0

Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
---
 PolyShim.Tests/NetCore30/ProcessTests.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PolyShim.Tests/NetCore30/ProcessTests.cs b/PolyShim.Tests/NetCore30/ProcessTests.cs
index d9b8fcb8..56345209 100644
--- a/PolyShim.Tests/NetCore30/ProcessTests.cs
+++ b/PolyShim.Tests/NetCore30/ProcessTests.cs
@@ -26,6 +26,7 @@ public void Kill_Test()
 
         // Act
         process.Kill(true);
+        process.WaitForExit();
 
         // Assert
         process.HasExited.Should().BeTrue();

From a7413c71f790a66ff6e1d217fdb1d847a1df5bdc Mon Sep 17 00:00:00 2001
From: Oleksii Holub <1935960+Tyrrrz@users.noreply.github.com>
Date: Fri, 17 Apr 2026 12:57:54 +0300
Subject: [PATCH 2/4] Update PolyShim.Tests/NetCore30/ProcessTests.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 PolyShim.Tests/NetCore30/ProcessTests.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PolyShim.Tests/NetCore30/ProcessTests.cs b/PolyShim.Tests/NetCore30/ProcessTests.cs
index 56345209..b0d8c7e4 100644
--- a/PolyShim.Tests/NetCore30/ProcessTests.cs
+++ b/PolyShim.Tests/NetCore30/ProcessTests.cs
@@ -26,9 +26,10 @@ public void Kill_Test()
 
         // Act
         process.Kill(true);
-        process.WaitForExit();
+        var exited = process.WaitForExit(TimeSpan.FromSeconds(5));
 
         // Assert
+        exited.Should().BeTrue();
         process.HasExited.Should().BeTrue();
     }
 }

From 3b8c712197341d0c7fe29d56ab1aeccf2ac68411 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 17 Apr 2026 10:10:16 +0000
Subject: [PATCH 3/4] Fix build error: use WaitForExit(int) overload instead of
 WaitForExit(TimeSpan) (net6.0 compat)

Agent-Logs-Url: https://github.com/Tyrrrz/PolyShim/sessions/80c57795-1f5b-4b25-a4db-1c8fd7a3cff2

Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
---
 PolyShim.Tests/NetCore30/ProcessTests.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/PolyShim.Tests/NetCore30/ProcessTests.cs b/PolyShim.Tests/NetCore30/ProcessTests.cs
index b0d8c7e4..48b0974c 100644
--- a/PolyShim.Tests/NetCore30/ProcessTests.cs
+++ b/PolyShim.Tests/NetCore30/ProcessTests.cs
@@ -26,10 +26,9 @@ public void Kill_Test()
 
         // Act
         process.Kill(true);
-        var exited = process.WaitForExit(TimeSpan.FromSeconds(5));
+        var exited = process.WaitForExit(5000);
 
         // Assert
         exited.Should().BeTrue();
-        process.HasExited.Should().BeTrue();
     }
 }

From ba9b6ece09c47a6ce1f978e701de2ca0cddf3e2c Mon Sep 17 00:00:00 2001
From: Oleksii Holub <1935960+Tyrrrz@users.noreply.github.com>
Date: Fri, 17 Apr 2026 14:00:54 +0300
Subject: [PATCH 4/4] Update ProcessTests.cs

---
 PolyShim.Tests/NetCore30/ProcessTests.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/PolyShim.Tests/NetCore30/ProcessTests.cs b/PolyShim.Tests/NetCore30/ProcessTests.cs
index 48b0974c..b4db7d96 100644
--- a/PolyShim.Tests/NetCore30/ProcessTests.cs
+++ b/PolyShim.Tests/NetCore30/ProcessTests.cs
@@ -15,8 +15,8 @@ public void Kill_Test()
         {
             StartInfo = new ProcessStartInfo
             {
-                FileName = OperatingSystem.IsWindows() ? "cmd" : "sh",
-                Arguments = OperatingSystem.IsWindows() ? "/c timeout 1" : "-c 'sleep 1'",
+                FileName = OperatingSystem.IsWindows() ? "cmd" : "sleep",
+                Arguments = OperatingSystem.IsWindows() ? "/c timeout 1" : "1",
                 CreateNoWindow = true,
                 UseShellExecute = false,
             },
@@ -26,7 +26,7 @@ public void Kill_Test()
 
         // Act
         process.Kill(true);
-        var exited = process.WaitForExit(5000);
+        var exited = process.WaitForExit(TimeSpan.FromSeconds(5));
 
         // Assert
         exited.Should().BeTrue();