Skip to content

Fix issue 2288 #2313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 28, 2024
Merged

Fix issue 2288 #2313

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3941d7d
revert Workaround
gabidabet Sep 26, 2024
110e44e
fix the test
gabidabet Sep 26, 2024
2901139
apply review
gabidabet Sep 27, 2024
df6a367
Update assertion message
martincostello Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions test/Polly.Core.Tests/Hedging/HedgingStrategyOptionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =>
{
Expand All @@ -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 enter the {nameof(semaphore)}, the hedging callback didn't executed");
(await task).Result.Should().Be(99);
}

[Fact]
Expand Down
5 changes: 0 additions & 5 deletions test/Polly.Core.Tests/Polly.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 0 additions & 4 deletions test/Polly.Core.Tests/xunit.runner.json
View file
Open in desktop

This file was deleted.