From c246ea9e62653e97a5e9fb751c72f79e80cbca6d Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 28 Nov 2018 14:33:59 -0500 Subject: [PATCH] This fukken service test --- .../TestServerService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Tgstation.Server.Host.Service.Tests/TestServerService.cs b/tests/Tgstation.Server.Host.Service.Tests/TestServerService.cs index aa87575f66..88b204c7df 100644 --- a/tests/Tgstation.Server.Host.Service.Tests/TestServerService.cs +++ b/tests/Tgstation.Server.Host.Service.Tests/TestServerService.cs @@ -40,7 +40,8 @@ namespace Tgstation.Server.Host.Service.Tests originalToken = cts.Token; cancellationToken = originalToken; } - mockWatchdog.Setup(x => x.RunAsync(false, args, It.IsAny())).Callback((bool x, string[] _, CancellationToken token) => cancellationToken = token).Returns(Task.CompletedTask).Verifiable(); + var cancelled = false; + mockWatchdog.Setup(x => x.RunAsync(false, args, It.IsAny())).Callback((bool x, string[] _, CancellationToken token) => token.Register(() => cancelled = true)).Returns(Task.CompletedTask).Verifiable(); var mockWatchdogFactory = new Mock(); var mockLoggerFactory = new LoggerFactory(); mockWatchdogFactory.Setup(x => x.CreateWatchdog(mockLoggerFactory)).Returns(mockWatchdog.Object).Verifiable(); @@ -51,12 +52,11 @@ namespace Tgstation.Server.Host.Service.Tests mockWatchdog.VerifyAll(); Assert.AreNotSame(cancellationToken, originalToken); - Assert.IsFalse(cancellationToken.IsCancellationRequested); + Assert.IsFalse(cancelled); onStop.Invoke(service, Array.Empty()); - Assert.IsTrue(cancellationToken.IsCancellationRequested); + Assert.IsTrue(cancelled); } - mockWatchdogFactory.VerifyAll(); } }