From 08c93ecac6f6a4c83ac94ce863698fd6eb895a72 Mon Sep 17 00:00:00 2001 From: Dominion Date: Mon, 5 Jun 2023 09:35:21 -0400 Subject: [PATCH] Tests are so fast now it's hard to catch this --- .../Tgstation.Server.Tests/Live/TestLiveServer.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs index cba3568f2e..bace1d01f8 100644 --- a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs +++ b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs @@ -190,8 +190,19 @@ namespace Tgstation.Server.Tests.Live { NewVersion = TestUpdateVersion }, cancellationToken); - var serverInfo = await adminClient.ServerInformation(cancellationToken); - Assert.IsTrue(serverInfo.UpdateInProgress); + + try + { + var serverInfoTask = adminClient.ServerInformation(cancellationToken); + var completedTask = await Task.WhenAny(serverTask, serverInfoTask); + if (completedTask == serverInfoTask) + { + var serverInfo = await serverInfoTask; + Assert.IsTrue(serverInfo.UpdateInProgress); + } + } + catch (ServiceUnavailableException) { } + catch (HttpRequestException) { } } //wait up to 3 minutes for the dl and install