From 425386a528a33d312823a09b8dffef38720654c7 Mon Sep 17 00:00:00 2001
From: Dominion <Cyberboss@users.noreply.github.com>
Date: Wed, 7 Jun 2023 19:31:41 -0400
Subject: [PATCH] Another dump tests error fix

---
 .../Live/Instance/WatchdogTest.cs             | 60 +++++++++++--------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs
index c97cac3308..aff010522d 100644
--- a/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs
+++ b/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs
@@ -224,35 +224,45 @@ namespace Tgstation.Server.Tests.Live.Instance
 			Assert.AreEqual(1, dumpFiles.Length);
 			File.Delete(dumpFiles.Single());
 
-			KillDD(true);
-			var jobTcs = new TaskCompletionSource();
-			var killTaskStarted = new TaskCompletionSource();
-			var killTask = Task.Run(() =>
-			{
-				killTaskStarted.SetResult();
-				while (!jobTcs.Task.IsCompleted)
-					KillDD(false);
-			}, cancellationToken);
-
 			JobResponse job;
-			try
+			while (true)
 			{
-				await killTaskStarted.Task;
-				var dumpTask = instanceClient.DreamDaemon.CreateDump(cancellationToken);
-				job = await WaitForJob(await dumpTask, 20, true, null, cancellationToken);
-			}
-			finally
-			{
-				jobTcs.SetResult();
-				await killTask;
+				KillDD(true);
+				var jobTcs = new TaskCompletionSource();
+				var killTaskStarted = new TaskCompletionSource();
+				var killTask = Task.Run(() =>
+				{
+					killTaskStarted.SetResult();
+					while (!jobTcs.Task.IsCompleted)
+						KillDD(false);
+				}, cancellationToken);
+
+				try
+				{
+					await killTaskStarted.Task;
+					var dumpTask = instanceClient.DreamDaemon.CreateDump(cancellationToken);
+					job = await WaitForJob(await dumpTask, 20, true, null, cancellationToken);
+				}
+				finally
+				{
+					jobTcs.SetResult();
+					await killTask;
+				}
+
+				// these can also happen
+
+				if (!(new PlatformIdentifier().IsWindows
+					&& (job.ExceptionDetails.Contains("BetterWin32Errors.Win32Exception: E_ACCESSDENIED: Access is denied.")
+					|| job.ExceptionDetails.Contains("BetterWin32Errors.Win32Exception: E_HANDLE: The handle is invalid.")
+					|| job.ExceptionDetails.Contains("BetterWin32Errors.Win32Exception: 3489660936: Unknown error (0xd0000008)")
+					|| job.ExceptionDetails.Contains("System.InvalidOperationException: No process is associated with this object."))))
+					break;
+
+				var restartJob = await instanceClient.DreamDaemon.Restart(cancellationToken);
+				await WaitForJob(restartJob, 20, false, null, cancellationToken);
 			}
 
-			// these can also happen
-			if (!(new PlatformIdentifier().IsWindows
-				&& (job.ExceptionDetails.Contains("BetterWin32Errors.Win32Exception: E_ACCESSDENIED: Access is denied.")
-				|| job.ExceptionDetails.Contains("BetterWin32Errors.Win32Exception: E_HANDLE: The handle is invalid.")
-				|| job.ExceptionDetails.Contains("BetterWin32Errors.Win32Exception: 3489660936: Unknown error (0xd0000008)")))) // kek
-				Assert.IsTrue(job.ErrorCode == ErrorCode.DreamDaemonOffline || job.ErrorCode == ErrorCode.GCoreFailure, $"{job.ErrorCode}: {job.ExceptionDetails}");
+			Assert.IsTrue(job.ErrorCode == ErrorCode.DreamDaemonOffline || job.ErrorCode == ErrorCode.GCoreFailure, $"{job.ErrorCode}: {job.ExceptionDetails}");
 
 			await Task.Delay(TimeSpan.FromSeconds(20), cancellationToken);