diff --git a/src/Tgstation.Server.Host/Server.cs b/src/Tgstation.Server.Host/Server.cs index 18fcb68408..6f4a10c7d4 100644 --- a/src/Tgstation.Server.Host/Server.cs +++ b/src/Tgstation.Server.Host/Server.cs @@ -432,7 +432,8 @@ namespace Tgstation.Server.Host { logger?.LogTrace("FileSystemWatcher triggered."); - if (eventArgs.FullPath == ioManager.ResolvePath(updatePath!) && await ioManager.FileExists(eventArgs.FullPath, CancellationToken.None)) // DCT: None available + // DCT: None available + if (eventArgs.FullPath == ioManager.ResolvePath(updatePath!) && await ioManager.FileExists(eventArgs.FullPath, CancellationToken.None)) { logger?.LogInformation("Host watchdog appears to be requesting server termination!"); lock (restartLock) diff --git a/tests/Tgstation.Server.Api.Tests/Models/Internal/TestEngineVersion.cs b/tests/Tgstation.Server.Api.Tests/Models/Internal/TestEngineVersion.cs index f13f09f3ff..cda2983b53 100644 --- a/tests/Tgstation.Server.Api.Tests/Models/Internal/TestEngineVersion.cs +++ b/tests/Tgstation.Server.Api.Tests/Models/Internal/TestEngineVersion.cs @@ -40,7 +40,7 @@ namespace Tgstation.Server.Api.Models.Internal.Tests Assert.IsFalse(EngineVersion.TryParse("x", out version)); Assert.IsNull(version); - Assert.ThrowsException(() => EngineVersion.Parse("x")); + Assert.ThrowsExactly(() => EngineVersion.Parse("x")); } } } diff --git a/tests/Tgstation.Server.Api.Tests/TestApiHeaders.cs b/tests/Tgstation.Server.Api.Tests/TestApiHeaders.cs index 8d6808f1b2..a0cf7fc181 100644 --- a/tests/Tgstation.Server.Api.Tests/TestApiHeaders.cs +++ b/tests/Tgstation.Server.Api.Tests/TestApiHeaders.cs @@ -21,8 +21,8 @@ namespace Tgstation.Server.Api.Tests [TestMethod] public void TestConstruction() { - Assert.ThrowsException(() => new ApiHeaders(null, null)); - Assert.ThrowsException(() => new ApiHeaders(productHeaderValue, null)); + Assert.ThrowsExactly(() => new ApiHeaders(null, null)); + Assert.ThrowsExactly(() => new ApiHeaders(productHeaderValue, null)); var headers = new ApiHeaders(productHeaderValue, new TokenResponse { Bearer = String.Empty }); headers = new ApiHeaders(productHeaderValue, String.Empty, OAuthProvider.GitHub); } @@ -54,7 +54,7 @@ namespace Tgstation.Server.Api.Tests Assert.AreEqual(ConformantHeader, header.RawUserAgent); Assert.IsNotNull(header.UserAgent); - Assert.ThrowsException(() => TestHeader(String.Empty)); + Assert.ThrowsExactly(() => TestHeader(String.Empty)); } } } diff --git a/tests/Tgstation.Server.Client.Tests/TestApiClient.cs b/tests/Tgstation.Server.Client.Tests/TestApiClient.cs index 630526dbd6..ca18f42d63 100644 --- a/tests/Tgstation.Server.Client.Tests/TestApiClient.cs +++ b/tests/Tgstation.Server.Client.Tests/TestApiClient.cs @@ -98,7 +98,7 @@ namespace Tgstation.Server.Client.Tests null, false); - await Assert.ThrowsExceptionAsync(() => client.Read(Routes.Engine, default).AsTask()); + await Assert.ThrowsExactlyAsync(() => client.Read(Routes.Engine, default).AsTask()); } } } diff --git a/tests/Tgstation.Server.Client.Tests/TestServerClientFactory.cs b/tests/Tgstation.Server.Client.Tests/TestServerClientFactory.cs index c9af0484da..97023d7b62 100644 --- a/tests/Tgstation.Server.Client.Tests/TestServerClientFactory.cs +++ b/tests/Tgstation.Server.Client.Tests/TestServerClientFactory.cs @@ -10,7 +10,7 @@ namespace Tgstation.Server.Client.Tests [TestMethod] public void TestConstruction() { - Assert.ThrowsException(() => new RestServerClientFactory(null)); + Assert.ThrowsExactly(() => new RestServerClientFactory(null)); new RestServerClientFactory(new ProductHeaderValue("Tgstation.Server.Client.Tests", GetType().Assembly.GetName().Version.ToString())); } }