Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "Revert "Load Maps on Round Start, not Round Restart v3 (#6989)" (#6990)"

Browse Source 
This reverts commit 4aa65b6708.

Fixed the deadlock bug on postgres.
This commit is contained in:
Pieter-Jan Briers
2022-03-04 23:25:41 +01:00
parent c8a7f41331
commit 2c721226d6
6 changed files with 117 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs
View File

@@ -234,8 +234,6 @@ public sealed class AddTests : ContentIntegrationTest
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>();
@@ -245,10 +243,7 @@ public sealed class AddTests : ContentIntegrationTest
await server.WaitPost(() =>
{
var coordinates = GetMainEntityCoordinates(sMaps);
var entity = sEntities.SpawnEntity(null, coordinates);
sAdminLogSystem.Add(LogType.Unknown, $"{entity} test log: {guid}");
sAdminLogSystem.Add(LogType.Unknown, $"test log: {guid}");
});
await server.WaitPost(() =>
@@ -284,8 +279,7 @@ public sealed class AddTests : ContentIntegrationTest
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();