From baed4daca7724df43c2e99c5657ea1639ee60d53 Mon Sep 17 00:00:00 2001 From: Dominion Date: Sun, 2 Apr 2023 19:21:11 -0400 Subject: [PATCH] Test performance improvement --- .../Instance/WatchdogTest.cs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs b/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs index 495861ee07..bd870d3902 100644 --- a/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs +++ b/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs @@ -28,6 +28,8 @@ namespace Tgstation.Server.Tests.Instance { readonly IInstanceClient instanceClient; + bool ranTimeoutTest = false; + public WatchdogTest(IInstanceClient instanceClient) : base(instanceClient.Jobs) { @@ -553,13 +555,18 @@ namespace Tgstation.Server.Tests.Instance Timeout = TimeSpan.FromMilliseconds(1), }, cancellationToken); - Assert.AreEqual(deploymentSecurity, refreshed.ApiValidationSecurityLevel); - Assert.AreEqual(requireApi, refreshed.RequireDMApiValidation); - Assert.AreEqual(TimeSpan.FromMilliseconds(1), refreshed.Timeout); + JobResponse compileJobJob; + if (!ranTimeoutTest) + { + Assert.AreEqual(deploymentSecurity, refreshed.ApiValidationSecurityLevel); + Assert.AreEqual(requireApi, refreshed.RequireDMApiValidation); + Assert.AreEqual(TimeSpan.FromMilliseconds(1), refreshed.Timeout); - var compileJobJob = await instanceClient.DreamMaker.Compile(cancellationToken); + compileJobJob = await instanceClient.DreamMaker.Compile(cancellationToken); + + await WaitForJob(compileJobJob, 90, true, ErrorCode.DeploymentTimeout, cancellationToken); + } - await WaitForJob(compileJobJob, 90, true, ErrorCode.DeploymentTimeout, cancellationToken); await instanceClient.DreamMaker.Update(new DreamMakerRequest { Timeout = TimeSpan.FromMinutes(5),