From 2ff7b610326d0f2cd805b1beaac16c5136c04a7b Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 9 Jul 2020 14:29:34 -0400 Subject: [PATCH] So this is a windows only test for now --- .../Instance/WatchdogTest.cs | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs b/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs index 7e7be1b796..822a8f6a3d 100644 --- a/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs +++ b/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs @@ -366,29 +366,33 @@ namespace Tgstation.Server.Tests.Instance var daemonStatus = await instanceClient.DreamDaemon.Read(cancellationToken); Assert.AreEqual(WatchdogStatus.Online, daemonStatus.Status.Value); - // Try killing the DD process to ensure it gets set to the restoring state - do + // The measure we use to test dream daemon startup doesn't work on linux currently + if (new PlatformIdentifier().IsWindows) { - KillDD(true); - await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken); + // Try killing the DD process to ensure it gets set to the restoring state + do + { + KillDD(true); + await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken); + daemonStatus = await instanceClient.DreamDaemon.Read(cancellationToken); + } + while (daemonStatus.Status == WatchdogStatus.Online); + Assert.AreEqual(WatchdogStatus.Restoring, daemonStatus.Status.Value); + + // Kill it again + do + { + KillDD(false); + daemonStatus = await instanceClient.DreamDaemon.Read(cancellationToken); + } + while (daemonStatus.Status == WatchdogStatus.Online || daemonStatus.Status == WatchdogStatus.Restoring); + Assert.AreEqual(WatchdogStatus.DelayedRestart, daemonStatus.Status.Value); + + await Task.Delay(TimeSpan.FromSeconds(10), cancellationToken); + daemonStatus = await instanceClient.DreamDaemon.Read(cancellationToken); + Assert.AreEqual(WatchdogStatus.Online, daemonStatus.Status.Value); } - while (daemonStatus.Status == WatchdogStatus.Online); - Assert.AreEqual(WatchdogStatus.Restoring, daemonStatus.Status.Value); - - // Kill it again - do - { - KillDD(false); - daemonStatus = await instanceClient.DreamDaemon.Read(cancellationToken); - } - while (daemonStatus.Status == WatchdogStatus.Online || daemonStatus.Status == WatchdogStatus.Restoring); - Assert.AreEqual(WatchdogStatus.DelayedRestart, daemonStatus.Status.Value); - - await Task.Delay(TimeSpan.FromSeconds(10), cancellationToken); - - daemonStatus = await instanceClient.DreamDaemon.Read(cancellationToken); - Assert.AreEqual(WatchdogStatus.Online, daemonStatus.Status.Value); } static bool KillDD(bool require)