diff --git a/Content.IntegrationTests/PoolManager.cs b/Content.IntegrationTests/PoolManager.cs index 397a20950d..27e03fe32c 100644 --- a/Content.IntegrationTests/PoolManager.cs +++ b/Content.IntegrationTests/PoolManager.cs @@ -376,6 +376,8 @@ public static class PoolManager var ticker = pair.Server.ResolveDependency().System(); Assert.That(ticker.DummyTicker, Is.EqualTo(pair.Settings.DummyTicker)); + var cfg = pair.Server.ResolveDependency(); + Assert.That(cfg.GetCVar(CCVars.GameLobbyEnabled), Is.EqualTo(pair.Settings.InLobby)); var status = ticker.PlayerGameStatuses[sPlayer.Sessions.Single().UserId]; var expected = pair.Settings.InLobby ? PlayerGameStatus.NotReadyToPlay diff --git a/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs b/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs index 4236682401..d995bf1468 100644 --- a/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs +++ b/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs @@ -204,17 +204,9 @@ public sealed class AddTests [Test] public async Task PreRoundAddAndGetSingle() { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Dirty = true }); + await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Dirty = true, InLobby = true }); var server = pairTracker.Pair.Server; - var configManager = server.ResolveDependency(); - await server.WaitPost(() => - { - configManager.SetCVar(CCVars.GameLobbyEnabled, true); - var command = new RestartRoundNowCommand(); - command.Execute(null, string.Empty, Array.Empty()); - }); - var sDatabase = server.ResolveDependency(); var sSystems = server.ResolveDependency(); diff --git a/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs b/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs index 0174fcbb1f..80d3bbe75d 100644 --- a/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs +++ b/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs @@ -16,22 +16,13 @@ namespace Content.IntegrationTests.Tests.GameRules [Test] public async Task RestartTest() { - await using var pairTracker = await PoolManager.GetServerClient(); + await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { InLobby = true }); var server = pairTracker.Pair.Server; var entityManager = server.ResolveDependency(); - var configManager = server.ResolveDependency(); - await server.WaitPost(() => - { - configManager.SetCVar(CCVars.GameLobbyEnabled, true); - var command = new RestartRoundNowCommand(); - command.Execute(null, string.Empty, Array.Empty()); - }); - var sGameTicker = server.ResolveDependency().GetEntitySystem(); var sGameTiming = server.ResolveDependency(); - sGameTicker.StartGameRule("MaxTimeRestart", out var ruleEntity); Assert.That(entityManager.TryGetComponent(ruleEntity, out var maxTime)); @@ -62,14 +53,6 @@ namespace Content.IntegrationTests.Tests.GameRules { Assert.That(sGameTicker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby)); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); - await server.WaitPost(() => - { - configManager.SetCVar(CCVars.GameLobbyEnabled, false); - var command = new RestartRoundNowCommand(); - command.Execute(null, string.Empty, Array.Empty()); - }); - await PoolManager.RunTicksSync(pairTracker.Pair, 30); await pairTracker.CleanReturnAsync(); }