From a29331cb00df0060aea5764e720d97d4d2dc961c Mon Sep 17 00:00:00 2001
From: Dominion <Cyberboss@users.noreply.github.com>
Date: Sat, 27 May 2023 11:33:16 -0400
Subject: [PATCH] Test error log failure fixes

---
 .../Live/TestLiveServer.cs                    | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
index fad45213ee..9fe1dd22ed 100644
--- a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
+++ b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
@@ -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}");
+					}
+				}
 			}
 		}