From cde71fb9f829b41d70fae907597cabf136c48a2c Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 27 Jul 2025 17:37:24 -0400 Subject: [PATCH] Don't get FileDownloader too soon --- tests/Tgstation.Server.Tests/Live/TestLiveServer.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs index a927334426..b55ce7bab9 100644 --- a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs +++ b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs @@ -97,7 +97,7 @@ namespace Tgstation.Server.Tests.Live var potentialProcesses = System.Diagnostics.Process.GetProcessesByName("dotnet") .Where(process => { - if (GetCommandLine(process).Contains("Robust.Server")) + if (GetCommandLine(process)?.Contains("Robust.Server") == true) return true; process.Dispose(); @@ -1486,7 +1486,7 @@ namespace Tgstation.Server.Tests.Live // main run var serverTask = server.Run(cancellationToken).AsTask(); - var fileDownloader = ((Host.Server)server.RealServer).Host.Services.GetRequiredService(); + Host.IO.IFileDownloader GetFileDownloader() => ((Host.Server)server.RealServer).Host.Services.GetRequiredService(); var graphQLClientFactory = new GraphQLServerClientFactory(restClientFactory); try { @@ -1642,7 +1642,7 @@ namespace Tgstation.Server.Tests.Live var instanceTest = new InstanceTest( firstAdminRestClient.Instances, - fileDownloader, + GetFileDownloader(), GetInstanceManager(), (ushort)server.ApiUrl.Port); @@ -1651,7 +1651,7 @@ namespace Tgstation.Server.Tests.Live var testSerialized = TestingUtils.RunningInGitHubActions; // they only have 2 cores, can't handle intense parallelization async Task ODCompatTests() { - var edgeODVersionTask = EngineTest.GetEdgeVersion(EngineType.OpenDream, GetLogger(), fileDownloader, cancellationToken); + var edgeODVersionTask = EngineTest.GetEdgeVersion(EngineType.OpenDream, GetLogger(), GetFileDownloader(), cancellationToken); var ex = await Assert.ThrowsExceptionAsync( () => InstanceTest.DownloadEngineVersion( @@ -1660,7 +1660,7 @@ namespace Tgstation.Server.Tests.Live Engine = EngineType.OpenDream, SourceSHA = "f1dc153caf9d84cd1d0056e52286cc0163e3f4d3", // 1b4 verified version }, - fileDownloader, + GetFileDownloader(), server.OpenDreamUrl, cancellationToken).AsTask()); @@ -1959,7 +1959,7 @@ namespace Tgstation.Server.Tests.Live preStartupTime = DateTimeOffset.UtcNow; serverTask = server.Run(cancellationToken).AsTask(); long expectedCompileJobId, expectedStaged; - var edgeVersion = await EngineTest.GetEdgeVersion(EngineType.Byond, GetLogger(), fileDownloader, cancellationToken); + var edgeVersion = await EngineTest.GetEdgeVersion(EngineType.Byond, GetLogger(), GetFileDownloader(), cancellationToken); await using (var adminClient = await CreateAdminClient(server.ApiUrl, cancellationToken)) { var restAdminClient = adminClient.RestClient;