Fix #2288 (#2313)

Remove xunit workaround.
App-vNext · Sep 28, 2024 · 9f004a2 · 9f004a2
1 parent 22d09c0
commit 9f004a2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/test/Polly.Core.Tests/Hedging/HedgingStrategyOptionsTests.cs b/test/Polly.Core.Tests/Hedging/HedgingStrategyOptionsTests.cs
@@ -27,6 +27,7 @@ public async Task HedgingActionGenerator_EnsureDefaults(bool synchronous)
         var options = new HedgingStrategyOptions<int>();
         var context = ResilienceContextPool.Shared.Get().Initialize<int>(synchronous);
         var threadId = Thread.CurrentThread.ManagedThreadId;
+        using var semaphore = new SemaphoreSlim(0);
 
         var action = options.ActionGenerator(new HedgingActionGeneratorArguments<int>(context, context, 1, c =>
         {
@@ -39,11 +40,16 @@ public async Task HedgingActionGenerator_EnsureDefaults(bool synchronous)
                 Thread.CurrentThread.ManagedThreadId.Should().Be(threadId);
             }
 
+            semaphore.Release();
             return Outcome.FromResultAsValueTask(99);
         }))!;
 
-        action.Should().NotBeNull();
-        (await action()).Result.Should().Be(99);
+        var task = action();
+        semaphore
+            .Wait(TimeSpan.FromSeconds(20))
+            .Should()
+            .BeTrue("The test thread failed to complete within the timeout");
+        (await task).Result.Should().Be(99);
     }
 
     [Fact]

diff --git a/test/Polly.Core.Tests/Polly.Core.Tests.csproj b/test/Polly.Core.Tests/Polly.Core.Tests.csproj
@@ -26,9 +26,4 @@
     <Using Include="Polly.Core.Tests.Helpers" />
     <Using Include="Polly.TestUtils" />
   </ItemGroup>
-
-  <!-- Workaround for xunit 2.8.0+ change. See https://github.com/xunit/xunit/discussions/3024.  -->
-  <ItemGroup>
-    <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
 </Project>
diff --git a/test/Polly.Core.Tests/xunit.runner.json b/test/Polly.Core.Tests/xunit.runner.json