Skip to content

Fix flaky ScheduleTask_InlineContinuationDoesNotDeadlock test on net481 #2957

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
martincostello merged 5 commits into from
Mar 4, 2026
+4 −30
Merged

Fix flaky ScheduleTask_InlineContinuationDoesNotDeadlock test on net481 #2957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35fe9fa
Initial plan
Copilot Mar 4, 2026
f16265a
Refactor ScheduleTask_InlineContinuationDoesNotDeadlock test to avoid…
Copilot Mar 4, 2026
aeb8741
Remove PR branch filters
martincostello Mar 4, 2026
41909e7
Fix ScheduleTask_InlineContinuationDoesNotDeadlock test - restore cor…
Copilot Mar 4, 2026
54e0fbc
Change assert
martincostello Mar 4, 2026
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
4 changes: 0 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ on:
- release/*
tags: [ '*' ]
pull_request:
branches:
- main
- release/*
- dotnet-vnext
workflow_dispatch:

env:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/code-ql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ on:
- main
- release/*
pull_request:
branches:
- main
- release/*
- dotnet-vnext
schedule:
- cron: '0 8 * * MON'
workflow_dispatch:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/dependency-review.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ name: dependency-review

on:
pull_request:
branches:
- main
- release/*
- dotnet-vnext

permissions: {}

Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/gh-pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ on:
- main
- release/*
pull_request:
branches:
- main
- release/*
- dotnet-vnext
workflow_dispatch:

permissions: {}
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ on:
- '**/*.gitignore'
- '**/*.md'
pull_request:
branches:
- main
- release/*
- dotnet-vnext
workflow_dispatch:

permissions: {}
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/mutation-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ on:
- main
- release/*
pull_request:
branches:
- main
- release/*
- dotnet-vnext
workflow_dispatch:

env:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/updater-approve.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ name: updater-approve

on:
pull_request:
branches:
- main
- release/*
- dotnet-vnext

permissions: {}

Expand Down
6 changes: 4 additions & 2 deletions test/Polly.Core.Tests/CircuitBreaker/Controller/ScheduledTaskExecutorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public void Dispose_WhenScheduledTaskExecuting()
[Fact]
public void ScheduleTask_InlineContinuationDoesNotDeadlock()
{
var timeout = TimeSpan.FromSeconds(1);
var timeout = TimeSpan.FromSeconds(10);
using var scheduler = new ScheduledTaskExecutor();

var firstTask = scheduler.ScheduleTask(() => Task.CompletedTask);
Expand All @@ -147,7 +147,9 @@ public void ScheduleTask_InlineContinuationDoesNotDeadlock()
TaskContinuationOptions.ExecuteSynchronously,
TaskScheduler.Default);

continuationTask.Wait(timeout).ShouldBeTrue();
#pragma warning disable xUnit1031
Task.WaitAll([firstTask, continuationTask], timeout).ShouldBeTrue();
#pragma warning restore xUnit1031
}

[Fact]
Expand Down
Loading