cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-29 08:00:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix TaskExtensions.WithToken

Browse Source
This commit is contained in:
Jordan
2023-06-19 11:23:54 -04:00
parent c406695715
commit a95cba1225
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Extensions/TaskExtensions.cs
+5 -1
View File
@@ -50,8 +50,12 @@ namespace Tgstation.Server.Host.Extensions
ArgumentNullException.ThrowIfNull(task);
var cancelTcs = new TaskCompletionSource();
Task completedTask;
using (cancellationToken.Register(() => cancelTcs.SetCanceled(cancellationToken)))
await Task.WhenAny(task, cancelTcs.Task);
completedTask = await Task.WhenAny(task, cancelTcs.Task);
if (completedTask != task)
await cancelTcs.Task;
return await task;
}
tests/Tgstation.Server.Host.Tests/Jobs/TestJobHandler.cs
+1 -1
View File
@@ -41,7 +41,7 @@ namespace Tgstation.Server.Host.Jobs.Tests
using var handler = new JobHandler(TestJob);
await Assert.ThrowsExceptionAsync<InvalidOperationException>(() => handler.Wait(cts.Token));
handler.Start();
await Assert.ThrowsExceptionAsync<OperationCanceledException>(() => handler.Wait(cts.Token));
await Assert.ThrowsExceptionAsync<TaskCanceledException>(() => handler.Wait(cts.Token));
tcs.SetResult();
await handler.Wait(default);
}