Merge branch 'master' into dev

This commit is contained in:
tgstation-server
2020-05-12 19:46:54 +00:00
@@ -43,11 +43,7 @@ namespace Tgstation.Server.Host.Service.Tests
using (var service = new ServerService(mockWatchdogFactory.Object, mockLoggerFactory, default))
{
onStart.Invoke(service, new object[] { args });
Assert.IsFalse(cancellationToken.IsCancellationRequested);
onStop.Invoke(service, Array.Empty<object>());
Assert.IsTrue(cancellationToken.IsCancellationRequested);
mockWatchdog.VerifyAll();
}