From 786f98d2869003c92cc0885e41b4e32eb3d1fb53 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 26 Feb 2024 20:46:04 -0500 Subject: [PATCH 1/3] Add a debug message --- tests/Tgstation.Server.Tests/Live/Instance/ChatTest.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Tgstation.Server.Tests/Live/Instance/ChatTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/ChatTest.cs index abb699815e4..1dcfd368da7 100644 --- a/tests/Tgstation.Server.Tests/Live/Instance/ChatTest.cs +++ b/tests/Tgstation.Server.Tests/Live/Instance/ChatTest.cs @@ -6,6 +6,8 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; +using Newtonsoft.Json; + using Tgstation.Server.Api.Models; using Tgstation.Server.Api.Models.Request; using Tgstation.Server.Api.Models.Response; @@ -196,7 +198,7 @@ async Task RunDiscord(CancellationToken cancellationToken) .OrderBy(x => x.StartedAt) .FirstOrDefault(); - Assert.IsNotNull(reconnectJob); + Assert.IsNotNull(reconnectJob, $"Jobs: {JsonConvert.SerializeObject(jobs)}"); await WaitForJob(reconnectJob, 60, false, null, cancellationToken); var channelIdStr = Environment.GetEnvironmentVariable("TGS_TEST_DISCORD_CHANNEL"); From 8a608968bbda5fb97cb4fa405d3e98e1ea9ddf70 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 27 Feb 2024 08:46:34 -0500 Subject: [PATCH 2/3] Fix potential `NullReferenceException` when disabling a user --- .../Utils/SignalR/ComprehensiveHubContext.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Tgstation.Server.Host/Utils/SignalR/ComprehensiveHubContext.cs b/src/Tgstation.Server.Host/Utils/SignalR/ComprehensiveHubContext.cs index d9c32143cef..b47f17d57b1 100644 --- a/src/Tgstation.Server.Host/Utils/SignalR/ComprehensiveHubContext.cs +++ b/src/Tgstation.Server.Host/Utils/SignalR/ComprehensiveHubContext.cs @@ -147,8 +147,9 @@ public void AbortUnauthedConnections(User user) return old; }); - foreach (var context in connections!) - context.Abort(); + if (connections != null) + foreach (var context in connections) + context.Abort(); } } } From 436938e6bb97a27d0760498d5da6375bbfbe5268 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 27 Feb 2024 08:47:12 -0500 Subject: [PATCH 3/3] Version bump to 6.3.1 --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 79032aba9b4..34d28b5b29b 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ - 6.3.0 + 6.3.1 5.1.0 10.2.0 7.0.0