Merge branch 'V6' into 1693-Shrimple

This commit is contained in:
Jordan Dominion
2023-11-07 19:37:03 -05:00
committed by GitHub
@@ -158,19 +158,24 @@ namespace Tgstation.Server.Tests.Live.Instance
var seenThisJob = seenJobs.TryGetValue(job.Id.Value, out var hubJob);
if (seenThisJob)
{
Assert.AreEqual(job.StoppedAt, hubJob.StoppedAt);
if (hubJob.StoppedAt.HasValue)
{
Assert.AreEqual(job.StoppedAt, hubJob.StoppedAt);
Assert.AreEqual(job.ExceptionDetails, hubJob.ExceptionDetails);
Assert.AreEqual(job.Progress, hubJob.Progress);
Assert.AreEqual(job.Stage, hubJob.Stage);
Assert.AreEqual(job.ErrorCode, hubJob.ErrorCode);
Assert.AreEqual(job.CancelledBy?.Id, hubJob.CancelledBy?.Id);
Assert.AreEqual(job.Cancelled, hubJob.Cancelled);
}
Assert.AreEqual(job.InstanceId, hubJob.InstanceId);
Assert.AreEqual(job.ExceptionDetails, hubJob.ExceptionDetails);
Assert.AreEqual(job.Stage, hubJob.Stage);
Assert.AreEqual(job.CancelledBy?.Id, hubJob.CancelledBy?.Id);
Assert.AreEqual(job.Cancelled, hubJob.Cancelled);
Assert.AreEqual(job.StartedBy?.Id, hubJob.StartedBy?.Id);
Assert.AreEqual(job.CancelRight, hubJob.CancelRight);
Assert.AreEqual(job.CancelRightsType, hubJob.CancelRightsType);
Assert.AreEqual(job.Progress, hubJob.Progress);
Assert.AreEqual(job.Description, hubJob.Description);
Assert.AreEqual(job.ErrorCode, hubJob.ErrorCode);
Assert.AreEqual(job.StartedAt, hubJob.StartedAt);
Assert.AreEqual(job.JobCode, hubJob.JobCode);
}
else
{