Disable GridFillComponent on some tests (#15757)

diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs
index 19cedddb00f061cf3119cd2fa67489e37e0412b1..06fc46c3aed81194eafbf493d992c24b6c435ed7 100644 (file)
--- a/Content.IntegrationTests/Tests/CargoTest.cs
+++ b/Content.IntegrationTests/Tests/CargoTest.cs
@@ -3,8 +3,10 @@ using System.Linq;
 using Content.Server.Cargo.Components;
 using Content.Server.Cargo.Systems;
 using Content.Shared.Cargo.Prototypes;
+using Content.Shared.CCVar;
 using Content.Shared.Stacks;
 using NUnit.Framework;
+using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
@@ -61,6 +63,8 @@ public sealed class CargoTest
         var entManager = server.ResolveDependency<IEntityManager>();
         var mapManager = server.ResolveDependency<IMapManager>();
         var protoManager = server.ResolveDependency<IPrototypeManager>();
+        var cfg = server.ResolveDependency<IConfigurationManager>();
+        await server.WaitPost(() => cfg.SetCVar(CCVars.DisableGridFill, true));
 
         await server.WaitAssertion(() =>
         {
@@ -100,6 +104,8 @@ public sealed class CargoTest
             }
             mapManager.DeleteMap(mapId);
         });
+
+        await server.WaitPost(() => cfg.SetCVar(CCVars.DisableGridFill, false));
         await pairTracker.CleanReturnAsync();
     }
 

diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index 98dd0c9dae24d9f885b3ddabbf2f2d3322b72f70..a98a2fa7f4f36a735b2161d7b3b0d39711f3f00f 100644 (file)
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using Content.Shared.CCVar;
 using Content.Shared.Coordinates;
 using NUnit.Framework;
+using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
@@ -26,6 +27,8 @@ namespace Content.IntegrationTests.Tests
             var server = pairTracker.Pair.Server;
 
             IEntityManager entityMan = null;
+            var cfg = server.ResolveDependency<IConfigurationManager>();
+            await server.WaitPost(() => cfg.SetCVar(CCVars.DisableGridFill, true));
 
             await server.WaitPost(() =>
             {
@@ -59,6 +62,8 @@ namespace Content.IntegrationTests.Tests
 
                 Assert.That(entityMan.EntityCount, Is.Zero);
             });
+
+            await server.WaitPost(() => cfg.SetCVar(CCVars.DisableGridFill, false));
             await pairTracker.CleanReturnAsync();
         }
 
@@ -70,6 +75,9 @@ namespace Content.IntegrationTests.Tests
             var map = await PoolManager.CreateTestMap(pairTracker);
             IEntityManager entityMan = null;
 
+            var cfg = server.ResolveDependency<IConfigurationManager>();
+            await server.WaitPost(() => cfg.SetCVar(CCVars.DisableGridFill, true));
+
             await server.WaitPost(() =>
             {
                 entityMan = IoCManager.Resolve<IEntityManager>();
@@ -98,6 +106,8 @@ namespace Content.IntegrationTests.Tests
 
                 Assert.That(entityMan.EntityCount, Is.Zero);
             });
+
+            await server.WaitPost(() => cfg.SetCVar(CCVars.DisableGridFill, false));
             await pairTracker.CleanReturnAsync();
         }
 
@@ -113,6 +123,9 @@ namespace Content.IntegrationTests.Tests
             var map = await PoolManager.CreateTestMap(pairTracker);
             IEntityManager entityMan = null;
 
+            var cfg = server.ResolveDependency<IConfigurationManager>();
+            await server.WaitPost(() => cfg.SetCVar(CCVars.DisableGridFill, true));
+
             await server.WaitPost(() =>
             {
                 entityMan = IoCManager.Resolve<IEntityManager>();
@@ -144,6 +157,8 @@ namespace Content.IntegrationTests.Tests
 
                 Assert.That(entityMan.EntityCount, Is.Zero);
             });
+
+            await server.WaitPost(() => cfg.SetCVar(CCVars.DisableGridFill, false));
             await pairTracker.CleanReturnAsync();
         }
 
@@ -157,6 +172,7 @@ namespace Content.IntegrationTests.Tests
                 "DebugExceptionExposeData",
                 "DebugExceptionInitialize",
                 "DebugExceptionStartup",
+                "GridFillComponent",
                 "Map", // We aren't testing a map entity in this test
                 "MapGrid",
                 "StationData", // errors when removed mid-round
@@ -252,6 +268,7 @@ namespace Content.IntegrationTests.Tests
                 "DebugExceptionExposeData",
                 "DebugExceptionInitialize",
                 "DebugExceptionStartup",
+                "GridFillComponent",
                 "Map", // We aren't testing a map entity in this test
                 "MapGrid",
                 "StationData", // errors when deleted mid-round

diff --git a/Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs b/Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs
index 90164e4dbee3817bafbb5025f9c2fa258ca78b5e..4621ecbd1e6349758e49fd835441d28e7f3a61ef 100644 (file)
--- a/Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs
@@ -3,7 +3,9 @@ using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Rules;
+using Content.Shared.CCVar;
 using NUnit.Framework;
+using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 
@@ -28,6 +30,8 @@ public sealed class StartEndGameRulesTest
         await server.WaitIdleAsync();
         var protoMan = server.ResolveDependency<IPrototypeManager>();
         var gameTicker = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<GameTicker>();
+        var cfg = server.ResolveDependency<IConfigurationManager>();
+        Assert.That(cfg.GetCVar(CCVars.DisableGridFill), Is.False);
 
         await server.WaitAssertion(() =>
         {

diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index a1d9045185fe91f60bbec942335f5d4aaea7c911..05930eaf84e42538e0711613f7018d8475805b5e 100644 (file)
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -10,10 +10,12 @@ using Content.Server.Shuttles.Components;
 using Content.Server.Spawners.Components;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
+using Content.Shared.CCVar;
 using Content.Shared.Roles;
 using NUnit.Framework;
 using Robust.Server.GameObjects;
 using Robust.Server.Maps;
+using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
@@ -55,6 +57,8 @@ namespace Content.IntegrationTests.Tests
 
             var mapLoader = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<MapLoaderSystem>();
             var mapManager = server.ResolveDependency<IMapManager>();
+            var cfg = server.ResolveDependency<IConfigurationManager>();
+            Assert.That(cfg.GetCVar(CCVars.DisableGridFill), Is.False);
 
             await server.WaitPost(() =>
             {
@@ -183,6 +187,8 @@ namespace Content.IntegrationTests.Tests
             var ticker = entManager.EntitySysManager.GetEntitySystem<GameTicker>();
             var shuttleSystem = entManager.EntitySysManager.GetEntitySystem<ShuttleSystem>();
             var xformQuery = entManager.GetEntityQuery<TransformComponent>();
+            var cfg = server.ResolveDependency<IConfigurationManager>();
+            Assert.That(cfg.GetCVar(CCVars.DisableGridFill), Is.False);
 
             await server.WaitPost(() =>
             {
@@ -335,6 +341,8 @@ namespace Content.IntegrationTests.Tests
 
             var mapLoader = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<MapLoaderSystem>();
             var mapManager = server.ResolveDependency<IMapManager>();
+            var cfg = server.ResolveDependency<IConfigurationManager>();
+            Assert.That(cfg.GetCVar(CCVars.DisableGridFill), Is.False);
 
             await server.WaitPost(() =>
             {

diff --git a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
index 904dd0c1b5ea2ea7de1c10192451daa5195c1392..2229c8c966f4ae1baf5af368424bd50746586ed7 100644 (file)
--- a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
+++ b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
@@ -1,7 +1,9 @@
 using System.Threading.Tasks;
+using Content.Shared.CCVar;
 using NUnit.Framework;
 using Robust.Server.GameObjects;
 using Robust.Server.Maps;
+using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
@@ -26,6 +28,8 @@ namespace Content.IntegrationTests.Tests
             var mapLoader = sEntities.System<MapLoaderSystem>();
             var xformSystem = sEntities.EntitySysManager.GetEntitySystem<SharedTransformSystem>();
             var resManager = server.ResolveDependency<IResourceManager>();
+            var cfg = server.ResolveDependency<IConfigurationManager>();
+            Assert.That(cfg.GetCVar(CCVars.DisableGridFill), Is.False);
 
             await server.WaitAssertion(() =>
             {

diff --git a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
index a94c25f19fe3e33d4d2a7b520ac7248e70bc7191..206b3072fb650569b6b113efa432a21e9907a25b 100644 (file)
--- a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
+++ b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
@@ -1,9 +1,11 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using Content.Shared.CCVar;
 using NUnit.Framework;
 using Robust.Server.GameObjects;
 using Robust.Server.Maps;
+using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
@@ -25,6 +27,8 @@ namespace Content.IntegrationTests.Tests
             var server = pairTracker.Pair.Server;
             var mapLoader = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<MapLoaderSystem>();
             var mapManager = server.ResolveDependency<IMapManager>();
+            var cfg = server.ResolveDependency<IConfigurationManager>();
+            Assert.That(cfg.GetCVar(CCVars.DisableGridFill), Is.False);
 
             await server.WaitPost(() =>
             {
@@ -92,6 +96,8 @@ namespace Content.IntegrationTests.Tests
             var mapManager = server.ResolveDependency<IMapManager>();
 
             MapId mapId = default;
+            var cfg = server.ResolveDependency<IConfigurationManager>();
+            Assert.That(cfg.GetCVar(CCVars.DisableGridFill), Is.False);
 
             // Load bagel.yml as uninitialized map, and save it to ensure it's up to date.
             server.Post(() =>
@@ -171,6 +177,8 @@ namespace Content.IntegrationTests.Tests
             var mapLoader = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<MapLoaderSystem>();
             var mapManager = server.ResolveDependency<IMapManager>();
             var userData = server.ResolveDependency<IResourceManager>().UserData;
+            var cfg = server.ResolveDependency<IConfigurationManager>();
+            Assert.That(cfg.GetCVar(CCVars.DisableGridFill), Is.False);
 
             MapId mapId = default;
             const string fileA = "/load tick load a.yml";

diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
index ac66d2acb3299707fc692ab9a34dff60e22b5f15..e60d3fdf28b4144162724dc328c4fe0b59561215 100644 (file)
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
@@ -1,4 +1,5 @@
 using Content.Server.Shuttles.Components;
+using Content.Shared.CCVar;
 
 namespace Content.Server.Shuttles.Systems;
 
@@ -18,6 +19,9 @@ public sealed partial class ShuttleSystem
             return;
         }
 
+        if (_cfg.GetCVar(CCVars.DisableGridFill))
+            return;
+
         // Spawn on a dummy map and try to dock if possible, otherwise dump it.
         var mapId = _mapManager.CreateMap();
         var valid = false;

diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index 577e716a683162e243f7cdec36a676d778e84439..1d4b7abbf1beb81accf011c2d358e7da480b8d62 100644 (file)
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -5,6 +5,7 @@ using Content.Shared.GameTicking;
 using Content.Shared.Shuttles.Systems;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
+using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
@@ -31,6 +32,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
     [Dependency] private readonly StunSystem _stuns = default!;
     [Dependency] private readonly ThrusterSystem _thruster = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
 
     private ISawmill _sawmill = default!;
 

diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 0e07fc4afc2cc2815bed80b0dfa08b03bb9fd7d3..74584c1835d51a14932e7e8fead848145bb706c4 100644 (file)
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1084,6 +1084,12 @@ namespace Content.Shared.CCVar
         /// </summary>
         public static readonly CVarDef<bool> CargoShuttles =
             CVarDef.Create("shuttle.cargo", true, CVar.SERVERONLY);
+        
+        /// <summary>
+        /// Whether to automatically spawn escape shuttles.
+        /// </summary>
+        public static readonly CVarDef<bool> DisableGridFill =
+            CVarDef.Create("shuttle.disable_grid_fill", false, CVar.SERVERONLY);
 
         /*
          * Emergency