cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-07-19 03:53:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

More test fixes

Browse Source
This commit is contained in:
Dominion
2023-04-02 20:02:00 -04:00
parent 3b5614e883
commit 29f070f21a
2 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs
+3 -3
View File
@@ -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)
tests/Tgstation.Server.Tests/IntegrationTest.cs
+12 -18
View File
@@ -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);