From 4599e462b2b075c151283cae3d927f0c65ebe93e Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 16 Oct 2023 12:36:50 -0400 Subject: [PATCH] Fix test timeouts for OpenDream installation --- tests/Tgstation.Server.Tests/Live/Instance/EngineTest.cs | 5 +++-- tests/Tgstation.Server.Tests/Live/Instance/InstanceTest.cs | 2 +- tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/Tgstation.Server.Tests/Live/Instance/EngineTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/EngineTest.cs index 77fe29fa01..d03ad60dba 100644 --- a/tests/Tgstation.Server.Tests/Live/Instance/EngineTest.cs +++ b/tests/Tgstation.Server.Tests/Live/Instance/EngineTest.cs @@ -122,8 +122,7 @@ namespace Tgstation.Server.Tests.Live.Instance null, cancellationToken), ErrorCode.ModelValidationFailure); - - int EngineInstallationTimeout() + public static int EngineInstallationTimeout(EngineVersion testVersion) { switch (testVersion.Engine.Value) { @@ -136,6 +135,8 @@ namespace Tgstation.Server.Tests.Live.Instance } } + int EngineInstallationTimeout() => EngineInstallationTimeout(testVersion); + async Task RunContinued(Task firstInstall, CancellationToken cancellationToken) { await firstInstall; diff --git a/tests/Tgstation.Server.Tests/Live/Instance/InstanceTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/InstanceTest.cs index 26f00486bd..c674a3a42d 100644 --- a/tests/Tgstation.Server.Tests/Live/Instance/InstanceTest.cs +++ b/tests/Tgstation.Server.Tests/Live/Instance/InstanceTest.cs @@ -210,7 +210,7 @@ namespace Tgstation.Server.Tests.Live.Instance var theJobWeWant = jobs.First(x => x.Description.Contains("Reconnect chat bot")); await Task.WhenAll( - jrt.WaitForJob(installJob2.InstallJob, 60, false, null, cancellationToken), + jrt.WaitForJob(installJob2.InstallJob, EngineTest.EngineInstallationTimeout(compatVersion) + 30, false, null, cancellationToken), jrt.WaitForJob(cloneRequest.Result.ActiveJob, 60, false, null, cancellationToken), jrt.WaitForJob(theJobWeWant, 30, false, null, cancellationToken), dmUpdateRequest.AsTask(), diff --git a/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs index bde4f32658..26dd4a326e 100644 --- a/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs +++ b/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs @@ -1042,7 +1042,7 @@ namespace Tgstation.Server.Tests.Live.Instance // This used to be the case but it gets deleted now that we have and test that // Assert.IsNull(byondInstallJob.InstallJob); - await WaitForJob(byondInstallJob.InstallJob, 60, false, null, cancellationToken); + await WaitForJob(byondInstallJob.InstallJob, EngineTest.EngineInstallationTimeout(versionToInstall) + 30, false, null, cancellationToken); const string DmeName = "LongRunning/long_running_test";