tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable GridFillComponent on some tests (#15757)

Browse Source
This commit is contained in:
Leon Friedrich
2023-04-25 11:48:29 +12:00
committed by GitHub
parent 4223fc00ba
commit 110060678f
9 changed files with 59 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.IntegrationTests/Tests/CargoTest.cs
View File

@@ -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();
}

17
Content.IntegrationTests/Tests/EntityTest.cs
View File

@@ -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

4
Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs
View File

@@ -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(() =>
{

8
Content.IntegrationTests/Tests/PostMapInitTest.cs
View File

@@ -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(() =>
{

4
Content.IntegrationTests/Tests/SaveLoadMapTest.cs
View File

@@ -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(() =>
{

8
Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
View File

@@ -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";

4
Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
View File

@@ -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;

2
Content.Server/Shuttles/Systems/ShuttleSystem.cs
View File

@@ -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!;

6
Content.Shared/CCVar/CCVars.cs
View File

@@ -1085,6 +1085,12 @@ namespace Content.Shared.CCVar
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
*/