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

Several fixes for the dummy chat provider

Browse Source
This commit is contained in:
Dominion
2023-05-26 12:59:06 -04:00
parent de8d1b9c1c
commit d3be54be15
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Tgstation.Server.Tests/Live/DummyChatProvider.cs
+12 -11
View File
@@ -83,8 +83,6 @@ namespace Tgstation.Server.Tests.Live
this.commands = commands ?? throw new ArgumentNullException(nameof(commands));
this.random = random ?? throw new ArgumentNullException(nameof(random));
// this could be random but there's no point
channelIdAllocator = 100000;
logger.LogTrace("Base channel ID {baseChannelId}", channelIdAllocator);
this.randomMessageCts = new CancellationTokenSource();
@@ -108,7 +106,8 @@ namespace Tgstation.Server.Tests.Live
Logger.LogTrace("SendMessage");
Assert.AreNotEqual(0UL, channelId);
Assert.IsTrue(channelId <= channelIdAllocator || channelId > (Int32.MaxValue / 2));
var condition = channelId <= channelIdAllocator || channelId >= (Int32.MaxValue / 2);
Assert.IsTrue(condition);
cancellationToken.ThrowIfCancellationRequested();
@@ -172,6 +171,7 @@ namespace Tgstation.Server.Tests.Live
Logger.LogTrace("DisconnectImpl");
cancellationToken.ThrowIfCancellationRequested();
connected = false;
channelIdAllocator = 0;
if (random.Next(0, 100) > 70)
throw new Exception("Random disconnection failure!");
@@ -220,21 +220,22 @@ namespace Tgstation.Server.Tests.Live
var delay = random.Next(0, 10000);
await Task.Delay(delay, cancellationToken);
if (!connected)
continue;
// %5 chance to disconnect randomly
if (enableRandomDisconnections != 0 && random.Next(0, 100) > 95)
{
connected = false;
channelIdAllocator = 0;
}
if (!connected)
continue;
if (channelIdAllocator >= Int32.MaxValue / 2)
Assert.Fail("Too many channels have been allocated!");
var isPm = channelIdAllocator == 0 || random.Next(0, 100) > 20;
var realId = (ulong)random.Next(1, (int)channelIdAllocator);
if (isPm)
realId += Int32.MaxValue / 2;
var isPm = channelIdAllocator == 0 || random.Next(0, 100) > 80;
var idRandomizer = isPm ? channelIdAllocator + (Int32.MaxValue / 2) : channelIdAllocator;
var realId = (ulong)random.Next(isPm ? Int32.MaxValue / 2 : 1, (int)idRandomizer);
var username = $"RandomUser{i}";
var sender = new ChatUser
tests/Tgstation.Server.Tests/Live/HardFailLogger.cs
+3 -2
View File
@@ -22,8 +22,9 @@ namespace Tgstation.Server.Tests.Live
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
{
var logMessage = formatter(state, exception);
if (logLevel == LogLevel.Error || (logLevel == LogLevel.Critical && logMessage != "DropDatabase configuration option set! Dropping any existing database..."))
failureSink(new AssertFailedException(logMessage));
if ((logLevel == LogLevel.Error && !logMessage.StartsWith("Error disconnecting connection "))
|| (logLevel == LogLevel.Critical && logMessage != "DropDatabase configuration option set! Dropping any existing database..."))
failureSink(new Exception(logMessage, exception));
}
}
}