Fix test timeouts for OpenDream installation

This commit is contained in:
Jordan Dominion
2023-10-16 12:36:50 -04:00
parent 97e4ad2dc5
commit 4599e462b2
3 changed files with 5 additions and 4 deletions
@@ -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;
@@ -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(),
@@ -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";