Fix admin log crash in the lobby

Add test
Fixes https://github.com/space-wizards/space-station-14/issues/5504
This commit is contained in:
DrSmugleaf
2021-11-24 18:52:16 +01:00
parent 3cf05535bd
commit 25ed516eb0
6 changed files with 195 additions and 43 deletions

View File

@@ -4,6 +4,7 @@ using System.Linq;
using System.Threading.Tasks;
using Content.Server.Administration.Logs;
using Content.Server.Database;
using Content.Server.GameTicking;
using Content.Shared.Administration.Logs;
using Content.Shared.CCVar;
using NUnit.Framework;
@@ -117,28 +118,22 @@ public class AddTests : ContentIntegrationTest
return false;
});
await server.WaitPost(() =>
var filter = new LogFilter
{
Task.Run(async () =>
{
var filter = new LogFilter
{
Round = log.RoundId,
Search = log.Message,
Types = new List<LogType> {log.Type},
};
Round = log.RoundId,
Search = log.Message,
Types = new List<LogType> {log.Type},
};
await foreach (var json in sDatabase.GetAdminLogsJson(filter))
{
var root = json.RootElement;
await foreach (var json in sDatabase.GetAdminLogsJson(filter))
{
var root = json.RootElement;
Assert.That(root.TryGetProperty("entity", out _), Is.True);
Assert.That(root.TryGetProperty("guid", out _), Is.True);
Assert.That(root.TryGetProperty("entity", out _), Is.True);
Assert.That(root.TryGetProperty("guid", out _), Is.True);
json.Dispose();
}
}).Wait();
});
json.Dispose();
}
}
[Test]
@@ -218,7 +213,7 @@ public class AddTests : ContentIntegrationTest
Guid playerGuid = default;
await server.WaitPost(() =>
{;
{
var player = sPlayers.ServerSessions.First();
playerGuid = player.UserId;
@@ -241,4 +236,76 @@ public class AddTests : ContentIntegrationTest
return false;
});
}
[Test]
public async Task PreRoundAddAndGetSingle()
{
var server = StartServer(new ServerContentIntegrationOption
{
CVarOverrides =
{
[CCVars.AdminLogsQueueSendDelay.Name] = "0",
[CCVars.GameLobbyEnabled.Name] = "true"
},
});
await server.WaitIdleAsync();
var sDatabase = server.ResolveDependency<IServerDbManager>();
var sEntities = server.ResolveDependency<IEntityManager>();
var sMaps = server.ResolveDependency<IMapManager>();
var sSystems = server.ResolveDependency<IEntitySystemManager>();
var sAdminLogSystem = sSystems.GetEntitySystem<AdminLogSystem>();
var sGamerTicker = sSystems.GetEntitySystem<GameTicker>();
var guid = Guid.NewGuid();
await server.WaitPost(() =>
{
var coordinates = GetMainEntityCoordinates(sMaps);
var entity = sEntities.SpawnEntity(null, coordinates);
sAdminLogSystem.Add(LogType.Unknown, $"{entity} test log: {guid}");
});
await server.WaitPost(() =>
{
sGamerTicker.StartRound(true);
});
LogRecord log = null;
await WaitUntil(server, async () =>
{
var logs = sAdminLogSystem.CurrentRoundLogs(new LogFilter
{
Search = guid.ToString()
});
await foreach (var found in logs)
{
log = found;
return true;
}
return false;
});
var filter = new LogFilter
{
Round = log.RoundId,
Search = log.Message,
Types = new List<LogType> {log.Type},
};
await foreach (var json in sDatabase.GetAdminLogsJson(filter))
{
var root = json.RootElement;
Assert.That(root.TryGetProperty("entity", out _), Is.True);
Assert.That(root.TryGetProperty("guid", out _), Is.True);
json.Dispose();
}
}
}