Skip to content
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

Unblock run when cancellation was requested #5267

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
+88 −11
Draft

Unblock run when cancellation was requested #5267

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
024c3d8
Unblock run when cancellation was requested but there are still runni…
nohwnd Mar 19, 2025
0e7051c
Fix test to test cancellation correctly
nohwnd Mar 19, 2025
a4afd44
what to do ?
nohwnd Mar 19, 2025
c422b39
Will continue later
nohwnd Mar 19, 2025
77355ac
Yield so we can abandon
nohwnd Mar 20, 2025
3ed9e8f
Yield so we can abandon
nohwnd Mar 20, 2025
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
6 changes: 5 additions & 1 deletion src/Adapter/MSTest.TestAdapter/Execution/TestExecutionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,11 @@ private async Task ExecuteTestsInSourceAsync(IEnumerable<TestCase> tests, IRunCo

try
{
await Task.WhenAll(tasks);
// Ensure we can abandon currently running tasks on cancellation, rather than waiting for them to complete.
// They will still run on background but we won't await them.
var runCancelled = new TaskCompletionSource<object>();
_testRunCancellationToken?.Register(() => runCancelled.TrySetCanceled());
await Task.WhenAny(Task.WhenAll(tasks), runCancelled.Task);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cancellation token _testRunCancellationToken is not a CancellationToken, so we cannot use Task.WhenAll(tasks, ct) here.

}
catch (Exception ex)
{
Expand Down
Loading