From 0745fef651601326885e94d1e651ffcd417fd29d Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Sun, 9 Jul 2023 18:05:49 -0400
Subject: [PATCH] Run compat test then edge test

---
 .../Live/TestLiveServer.cs                    | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
index 607ad74ce4..8cc9497138 100644
--- a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
+++ b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
@@ -1115,29 +1115,30 @@ namespace Tgstation.Server.Tests.Live
 							GetInstanceManager(),
 							(ushort)server.Url.Port);
 
-					var instanceTests = FailFast(
-						instanceTest
+					async Task RunInstanceTests()
+					{
+						await instanceTest
+							.RunCompatTests(
+								new Version(510, 1346),
+								adminClient.Instances.CreateClient(compatInstance),
+								compatDMPort,
+								compatDDPort,
+								server.HighPriorityDreamDaemon,
+								cancellationToken);
+
+						await instanceTest
 							.RunTests(
 								instanceClient,
 								mainDMPort,
 								mainDDPort,
 								server.HighPriorityDreamDaemon,
 								server.LowPriorityDeployments,
-								cancellationToken));
+								cancellationToken);
+					}
 
-					var compatTests = FailFast(
-						TestingUtils.RunningInGitHubActions
-							? Task.CompletedTask
-							: instanceTest
-								.RunCompatTests(
-									new Version(510, 1346),
-									adminClient.Instances.CreateClient(compatInstance),
-									compatDMPort,
-									compatDDPort,
-									server.HighPriorityDreamDaemon,
-									cancellationToken));
+					var instanceTests = FailFast(RunInstanceTests());
 
-					await Task.WhenAll(rootTest, adminTest, instancesTest, instanceTests, usersTest, compatTests);
+					await Task.WhenAll(rootTest, adminTest, instancesTest, instanceTests, usersTest);
 
 					var dd = await instanceClient.DreamDaemon.Read(cancellationToken);
 					Assert.AreEqual(WatchdogStatus.Online, dd.Status.Value);