From 6ce1b5f02691cfbc2d3544f051c22c533fce5041 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Wed, 28 Nov 2018 17:34:13 -0500
Subject: [PATCH] Fix service test

---
 src/Tgstation.Server.Host.Service/ServerService.cs             | 2 +-
 tests/Tgstation.Server.Host.Service.Tests/TestServerService.cs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Tgstation.Server.Host.Service/ServerService.cs b/src/Tgstation.Server.Host.Service/ServerService.cs
index 0758c021a3..ab6de43ac1 100644
--- a/src/Tgstation.Server.Host.Service/ServerService.cs
+++ b/src/Tgstation.Server.Host.Service/ServerService.cs
@@ -74,7 +74,7 @@ namespace Tgstation.Server.Host.Service
 		/// <returns>A <see cref="Task"/> representing the running operation</returns>
 		async Task RunWatchdog(string[] args, CancellationToken cancellationToken)
 		{
-			await watchdog.RunAsync(false, args, cancellationTokenSource.Token).ConfigureAwait(false);
+			await watchdog.RunAsync(false, args, cancellationToken).ConfigureAwait(false);
 
 			void StopServiceAsync()
 			{
diff --git a/tests/Tgstation.Server.Host.Service.Tests/TestServerService.cs b/tests/Tgstation.Server.Host.Service.Tests/TestServerService.cs
index 88b204c7df..d4e4545111 100644
--- a/tests/Tgstation.Server.Host.Service.Tests/TestServerService.cs
+++ b/tests/Tgstation.Server.Host.Service.Tests/TestServerService.cs
@@ -41,6 +41,7 @@ namespace Tgstation.Server.Host.Service.Tests
 				cancellationToken = originalToken;
 			}
 			var cancelled = false;
+			
 			mockWatchdog.Setup(x => x.RunAsync(false, args, It.IsAny<CancellationToken>())).Callback((bool x, string[] _, CancellationToken token) => token.Register(() => cancelled = true)).Returns(Task.CompletedTask).Verifiable();
 			var mockWatchdogFactory = new Mock<IWatchdogFactory>();
 			var mockLoggerFactory = new LoggerFactory();
@@ -48,11 +49,11 @@ namespace Tgstation.Server.Host.Service.Tests
 
 			using (var service = new ServerService(mockWatchdogFactory.Object, mockLoggerFactory, default))
 			{
+				Assert.IsFalse(cancelled);
 				onStart.Invoke(service, new object[] { args });
 				mockWatchdog.VerifyAll();
 
 				Assert.AreNotSame(cancellationToken, originalToken);
-				Assert.IsFalse(cancelled);
 
 				onStop.Invoke(service, Array.Empty<object>());
 				Assert.IsTrue(cancelled);