From e27c8fed3d8858e5da665de812e178febe3a282b Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 7 May 2020 16:23:42 -0400 Subject: [PATCH] Fix watchdog tests --- .../Instance/WatchdogTest.cs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs b/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs index 619c919657..c45218b08f 100644 --- a/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs +++ b/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs @@ -180,10 +180,20 @@ namespace Tgstation.Server.Tests.Instance ReceiveTimeout = 5000 }); - var result = await bts.SendTopic(IPAddress.Loopback, "tgs_integration_test_special_tactics=1", 1337, cancellationToken); - Assert.AreEqual("ack", result); + try + { + var result = await bts.SendTopic(IPAddress.Loopback, "tgs_integration_test_special_tactics=1", 1337, cancellationToken); + Assert.AreEqual("ack", result.StringData); - await Task.Delay(7000, cancellationToken); + await Task.Delay(7000, cancellationToken); + } + catch (OperationCanceledException) + { + throw; + } + catch + { + } } async Task DeployTestDme(string dmeName, DreamDaemonSecurity deploymentSecurity, CancellationToken cancellationToken)