From 0b92f631ba56bcbb9086e2bcf116565fbced4d57 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sat, 8 Jul 2023 13:01:24 -0400 Subject: [PATCH] Only expect channels while we can guarantee them --- tests/DMAPI/LongRunning/Test.dm | 7 ++++--- tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/DMAPI/LongRunning/Test.dm b/tests/DMAPI/LongRunning/Test.dm index f5b74203e4..52f98e6b2c 100644 --- a/tests/DMAPI/LongRunning/Test.dm +++ b/tests/DMAPI/LongRunning/Test.dm @@ -11,9 +11,10 @@ dab() TgsNew(new /datum/tgs_event_handler/impl, TGS_SECURITY_SAFE) - var/list/channels = TgsChatChannelInfo() - if(!length(channels)) - FailTest("Expected some chat channels!") + if(params["expect_chat_channels"]) + var/list/channels = TgsChatChannelInfo() + if(!length(channels)) + FailTest("Expected some chat channels!") StartAsync() diff --git a/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs index 7542c68513..58e101e0a6 100644 --- a/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs +++ b/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs @@ -107,6 +107,7 @@ namespace Tgstation.Server.Tests.Live.Instance Port = ddPort, MapThreads = 2, LogOutput = false, + AdditionalParameters = "expect_chat_channels=1" }, cancellationToken), CheckByondVersions(), ApiAssert.ThrowsException(() => instanceClient.DreamDaemon.Update(new DreamDaemonRequest @@ -138,6 +139,11 @@ namespace Tgstation.Server.Tests.Live.Instance await InteropTestsForLongRunningDme(cancellationToken); + await instanceClient.DreamDaemon.Update(new DreamDaemonRequest + { + AdditionalParameters = String.Empty + }, cancellationToken); + // for the restart staging tests await DeployTestDme("LongRunning/long_running_test", DreamDaemonSecurity.Trusted, true, cancellationToken);