mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-08-23 04:57:17 +01:00
Test error log failure fixes
This commit is contained in:
@@ -704,15 +704,34 @@ namespace Tgstation.Server.Tests.Live
|
||||
|
||||
ServiceCollectionExtensions.UseAdditionalLoggerProvider<HardFailLoggerProvider>();
|
||||
|
||||
var failureTask = HardFailLoggerProvider.FailureSource;
|
||||
var internalTask = TestTgsInternal(hardCancellationToken);
|
||||
await Task.WhenAny(
|
||||
internalTask,
|
||||
HardFailLoggerProvider.FailureSource);
|
||||
failureTask);
|
||||
|
||||
if (!internalTask.IsCompleted)
|
||||
{
|
||||
hardCancellationTokenSource.Cancel();
|
||||
await Task.WhenAll(internalTask, HardFailLoggerProvider.FailureSource);
|
||||
try
|
||||
{
|
||||
await failureTask;
|
||||
}
|
||||
finally
|
||||
{
|
||||
try
|
||||
{
|
||||
await internalTask;
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
Console.WriteLine("TEST CANCELLED!");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"ADDITIONAL TEST ERROR: {ex}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user