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

Fix deadlock in integration test

Browse Source
This commit is contained in:
Jordan Brown
2020-08-20 17:23:56 -04:00
parent 131b79bca5
commit 813c77e19a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs
+2 -2
View File
@@ -89,7 +89,7 @@ namespace Tgstation.Server.Tests.Instance
var killTask = Task.Run(() =>
{
killTaskStarted.SetResult(null);
while (jobTcs.Task?.IsCompleted != true)
while (!jobTcs.Task.IsCompleted)
KillDD(false);
});
@@ -98,12 +98,12 @@ namespace Tgstation.Server.Tests.Instance
{
await killTaskStarted.Task;
var dumpTask = instanceClient.DreamDaemon.CreateDump(cancellationToken);
await killTask;
job = await WaitForJob(await dumpTask, 20, true, null, cancellationToken);
}
finally
{
jobTcs.SetResult(null);
await killTask;
}
Assert.IsTrue(job.ErrorCode == ErrorCode.DreamDaemonOffline || job.ErrorCode == ErrorCode.GCoreFailure, $"{job.ErrorCode}: {job.ExceptionDetails}");
await Task.Delay(TimeSpan.FromSeconds(20), cancellationToken);