From 29f070f21abbfd2276c0e9dcae4617ce7cc4e043 Mon Sep 17 00:00:00 2001 From: Dominion Date: Sun, 2 Apr 2023 20:02:00 -0400 Subject: [PATCH] More test fixes --- .../Instance/WatchdogTest.cs | 6 ++-- .../Tgstation.Server.Tests/IntegrationTest.cs | 30 ++++++++----------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs b/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs index bd870d3902..e2fb6f4cd3 100644 --- a/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs +++ b/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs @@ -531,10 +531,10 @@ namespace Tgstation.Server.Tests.Instance do { - await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken); - daemonStatus = await instanceClient.DreamDaemon.Read(cancellationToken); + await Task.Delay(TimeSpan.FromSeconds(1), tempToken); + daemonStatus = await instanceClient.DreamDaemon.Read(tempToken); } - while (initialCompileJob.Id == daemonStatus.ActiveCompileJob.Id && !tempToken.IsCancellationRequested); + while (initialCompileJob.Id == daemonStatus.ActiveCompileJob.Id); } } catch (OperationCanceledException) diff --git a/tests/Tgstation.Server.Tests/IntegrationTest.cs b/tests/Tgstation.Server.Tests/IntegrationTest.cs index 2df4ee73b8..4ff01cd9e8 100644 --- a/tests/Tgstation.Server.Tests/IntegrationTest.cs +++ b/tests/Tgstation.Server.Tests/IntegrationTest.cs @@ -940,11 +940,13 @@ namespace Tgstation.Server.Tests Assert.AreEqual(WatchdogStatus.Online, dd.Status.Value); await instanceClient.DreamDaemon.Shutdown(cancellationToken); - await instanceClient.DreamDaemon.Update(new DreamDaemonRequest + dd = await instanceClient.DreamDaemon.Update(new DreamDaemonRequest { AutoStart = true }, cancellationToken); + Assert.AreEqual(WatchdogStatus.Offline, dd.Status); + await adminClient.Administration.Restart(cancellationToken); } @@ -982,7 +984,6 @@ namespace Tgstation.Server.Tests preStartupTime = DateTimeOffset.UtcNow; serverTask = server.Run(cancellationToken); long expectedCompileJobId; - DreamDaemonResponse currentDD; using (var adminClient = await CreateAdminClient(server.Url, cancellationToken)) { var instanceClient = adminClient.Instances.CreateClient(instance); @@ -996,21 +997,17 @@ namespace Tgstation.Server.Tests var wdt = new WatchdogTest(instanceClient); await wdt.WaitForJob(compileJob, 30, false, null, cancellationToken); - currentDD = await instanceClient.DreamDaemon.Read(cancellationToken); - Assert.AreEqual(currentDD.StagedCompileJob.Job.Id, compileJob.Id); + dd = await instanceClient.DreamDaemon.Read(cancellationToken); + Assert.AreEqual(dd.StagedCompileJob.Job.Id, compileJob.Id); await wdt.TellWorldToReboot(cancellationToken); expectedCompileJobId = compileJob.Id.Value; - currentDD = await instanceClient.DreamDaemon.Read(cancellationToken); - Assert.AreEqual(currentDD.ActiveCompileJob.Job.Id, expectedCompileJobId); - expectedCompileJobId = currentDD.ActiveCompileJob.Id.Value; + dd = await instanceClient.DreamDaemon.Read(cancellationToken); + Assert.AreEqual(WatchdogStatus.Online, dd.Status.Value); + Assert.AreEqual(dd.ActiveCompileJob.Job.Id, expectedCompileJobId); - compileJob = await instanceClient.DreamMaker.Compile(cancellationToken); - await wdt.WaitForJob(compileJob, 30, false, null, cancellationToken); - - currentDD = await instanceClient.DreamDaemon.Read(cancellationToken); - Assert.AreEqual(currentDD.StagedCompileJob.Job.Id, compileJob.Id); + expectedCompileJobId = dd.ActiveCompileJob.Id.Value; await adminClient.Administration.Restart(cancellationToken); } @@ -1025,12 +1022,9 @@ namespace Tgstation.Server.Tests var instanceClient = adminClient.Instances.CreateClient(instance); await WaitForInitialJobs(instanceClient); - await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken); - - var lastStaged = currentDD.StagedCompileJob; - currentDD = await instanceClient.DreamDaemon.Read(cancellationToken); - Assert.AreEqual(currentDD.ActiveCompileJob.Id, expectedCompileJobId); - Assert.AreEqual(currentDD.StagedCompileJob?.Id, lastStaged.Id); + var currentDD = await instanceClient.DreamDaemon.Read(cancellationToken); + Assert.AreEqual(expectedCompileJobId, currentDD.ActiveCompileJob.Id.Value); + Assert.AreEqual(WatchdogStatus.Online, currentDD.Status); var repoTest = new RepositoryTest(instanceClient.Repository, instanceClient.Jobs).RunPostTest(cancellationToken); await new ChatTest(instanceClient.ChatBots, adminClient.Instances, instance).RunPostTest(cancellationToken);