Fix broken tests directly mutating entities from wrong thread. (#31647)

* Fix broken tests directly mutating entities from wrong thread.

* fix build

* gundam

* stuff

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

diff --git a/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs b/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs
index b07c352c81dda48a1454acb5e2e9ae0b5f411ff6..45addff00bf5ef73b0a6db417914d8d2c9fd7c36 100644 (file)
--- a/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs
+++ b/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs
@@ -32,16 +32,14 @@ public sealed class ActionPvsDetachTest
         // PVS-detach action entities
         // We do this by just giving them the ghost layer
         var visSys = server.System<VisibilitySystem>();
-
-        await server.WaitPost(() =>
+        server.Post(() =>
         {
             var enumerator = server.Transform(ent).ChildEnumerator;
             while (enumerator.MoveNext(out var child))
             {
-                visSys.AddLayer(child, (int)VisibilityFlags.Ghost);
+                visSys.AddLayer(child, (int) VisibilityFlags.Ghost);
             }
         });
-
         await pair.RunTicksSync(5);
 
         // Client's actions have left been detached / are out of view, but action comp state has not changed
@@ -49,7 +47,7 @@ public sealed class ActionPvsDetachTest
         Assert.That(cSys.GetActions(cEnt).Count(), Is.EqualTo(initActions));
 
         // Re-enter PVS view
-        await server.WaitPost(() =>
+        server.Post(() =>
         {
             var enumerator = server.Transform(ent).ChildEnumerator;
             while (enumerator.MoveNext(out var child))

diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs
index 1b29e7ea7a99cfe45c66de33bfa63af77726df7a..37fd3a80f9a4f00ec17f99c963137c3f4a686d49 100644 (file)
--- a/Content.IntegrationTests/Tests/CargoTest.cs
+++ b/Content.IntegrationTests/Tests/CargoTest.cs
@@ -253,12 +253,12 @@ public sealed class CargoTest
     {
         await using var pair = await PoolManager.GetServerClient();
         var server = pair.Server;
-
         var entManager = server.ResolveDependency<IEntityManager>();
-        var priceSystem = entManager.System<PricingSystem>();
 
         await server.WaitAssertion(() =>
         {
+            var priceSystem = entManager.System<PricingSystem>();
+
             var ent = entManager.SpawnEntity("StackEnt", MapCoordinates.Nullspace);
             var price = priceSystem.GetPrice(ent);
             Assert.That(price, Is.EqualTo(100.0));