From a508de6b645d285f7a84a3b23afcd8f6005dca81 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 5 May 2020 14:45:25 -0400 Subject: [PATCH] Leave DD running after the watchdog test --- tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs b/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs index c76d30750e..03f03679fc 100644 --- a/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs +++ b/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs @@ -39,6 +39,8 @@ namespace Tgstation.Server.Tests.Instance await RunBasicTest(cancellationToken); await RunLongRunningTestThenUpdate(cancellationToken); await RunLongRunningTestThenUpdateWithByondVersionSwitch(cancellationToken); + + await StartAndLeaveRunning(cancellationToken); } async Task RunBasicTest(CancellationToken cancellationToken) @@ -125,7 +127,7 @@ namespace Tgstation.Server.Tests.Instance var daemonStatus = await DeployTestDme(DmeName, DreamDaemonSecurity.Safe, cancellationToken); - await WaitForJob(startJob, 10, false, cancellationToken); + await WaitForJob(startJob, 40, false, cancellationToken); Assert.IsTrue(daemonStatus.Running.Value); Assert.IsNotNull(daemonStatus.ActiveCompileJob); @@ -146,6 +148,13 @@ namespace Tgstation.Server.Tests.Instance Assert.IsFalse(daemonStatus.Running.Value); } + async Task StartAndLeaveRunning(CancellationToken cancellationToken) + { + var startJob = await instanceClient.DreamDaemon.Start(cancellationToken).ConfigureAwait(false); + + await WaitForJob(startJob, 40, false, cancellationToken); + } + async Task TellWorldToReboot(CancellationToken cancellationToken) { //we've wired long_running_test to reboot if its reboot mode is changed TO normal