Merge remote-tracking branch 'origin/main' into fix-patcher-mixed-eol-anchor

Author: SimonCropp

src/DiffEngine.Tests/ViewerProtocolTests.cs

@@ -383,12 +383,20 @@ public async Task AMalformedMoveLineRejectsTheResponse()
     /// The routing contract: only the tray parses keys, and it tells its collections apart by
     /// prefix, which an inline key can never carry because a Windows path cannot put a colon
     /// there.
+    /// <para>
+    /// The path is folded the way InlineKey folds it, which is not the same on every platform: on
+    /// Linux two paths differing only in case are two files. So the expectation is built from that
+    /// rule rather than written out lower cased, which pinned the Windows answer everywhere and
+    /// failed on Linux. That the two rules agree is TrackedKeyCaseTests; this is about the prefix.
+    /// </para>
     /// </summary>
     [Test]
     public async Task TrackedKeysCannotCollideWithInlineKeys()
     {
-        await Assert.That(TrackedKeys.ForMove(@"C:\Temp\A.txt")).IsEqualTo(@"move:c:\temp\a.txt");
-        await Assert.That(TrackedKeys.ForDelete(@"C:\Code\B.txt")).IsEqualTo(@"delete:c:\code\b.txt");
+        var move = @"C:\Temp\A.txt";
+        var delete = @"C:\Code\B.txt";
+        await Assert.That(TrackedKeys.ForMove(move)).IsEqualTo("move:" + InlineKey.FoldPath(move));
+        await Assert.That(TrackedKeys.ForDelete(delete)).IsEqualTo("delete:" + InlineKey.FoldPath(delete));
         await Assert.That(TrackedKeys.IsTracked(@"move:c:\temp\a.txt")).IsTrue();
         await Assert.That(TrackedKeys.IsTracked(@"delete:c:\code\b.txt")).IsTrue();
         await Assert.That(TrackedKeys.IsTracked(InlineKey.For(@"C:\Repo\Tests.cs", 42))).IsFalse();

src/DiffEngine.Tests/WindowsProcessTests.cs

@@ -142,8 +142,10 @@ public async Task TryTerminateProcess_WithWindowedProcess_GracefullyCloses()
 
             await Assert.That(result).IsTrue();
 
-            // Verify process exited gracefully
-            await Assert.That(process.WaitForExit(1000)).IsTrue();
+            // Generous, because the margin here is the runner's, not the product's: a windowed
+            // FakeDiffTool runs until something closes it, so waiting longer cannot turn a failure
+            // into a pass. One second was a bet on a two core runner being idle
+            await Assert.That(process.WaitForExit(30000)).IsTrue();
         }
         finally
         {
@@ -191,8 +193,12 @@ public async Task TryTerminateProcess_WithNonWindowedProcess_ForcefullyTerminate
 
             await Assert.That(result).IsTrue();
 
-            // Verify process was terminated (should be immediate with forceful kill)
-            await Assert.That(process.WaitForExit(1000)).IsTrue();
+            // Waiting longer is not enough on its own here: this FakeDiffTool sleeps five seconds
+            // and then exits by itself, so a wait past that passes whether it was terminated or
+            // simply ran out. The exit code is what tells those apart - TryTerminateProcess passes
+            // -1 to TerminateProcess, and running out returns 0
+            await Assert.That(process.WaitForExit(30000)).IsTrue();
+            await Assert.That(process.ExitCode).IsNotEqualTo(0);
         }
         finally
         {