Make tests faster (#8737)

* Test changes

* Make finding the test tile a little smarter

Content.IntegrationTests/Tests/GravityGridTest.cs

@@ -14,7 +14,7 @@ namespace Content.IntegrationTests.Tests
     /// making sure that gravity is applied to the correct grids.
     [TestFixture]
     [TestOf(typeof(GravityGeneratorComponent))]
-    public sealed class GravityGridTest : ContentIntegrationTest
+    public sealed class GravityGridTest
     {
         private const string Prototypes = @"
 - type: entity
@@ -30,10 +30,8 @@ namespace Content.IntegrationTests.Tests
         [Test]
         public async Task Test()
         {
-            var options = new ServerIntegrationOptions{ExtraPrototypes = Prototypes};
-            var server = StartServer(options);
-
-            await server.WaitIdleAsync();
+            await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{NoClient = true, ExtraPrototypes = Prototypes});
+            var server = pairTracker.Pair.Server;
 
             EntityUid generator = default;
             var entityMan = server.ResolveDependency<IEntityManager>();
@@ -42,11 +40,11 @@ namespace Content.IntegrationTests.Tests
             IMapGrid grid2 = null;
 
             // Create grids
-            server.Assert(() =>
+            await server.WaitAssertion(() =>
             {
                 var mapMan = IoCManager.Resolve<IMapManager>();
 
-                var mapId = GetMainMapId(mapMan);
+                var mapId = PoolManager.GetMainGrid(mapMan).ParentMapId;
                 grid1 = mapMan.CreateGrid(mapId);
                 grid2 = mapMan.CreateGrid(mapId);
 
@@ -57,9 +55,10 @@ namespace Content.IntegrationTests.Tests
                 var powerComponent = entityMan.GetComponent<ApcPowerReceiverComponent>(generator);
                 powerComponent.NeedsPower = false;
             });
-            server.RunTicks(1);
 
-            server.Assert(() =>
+            await server.WaitRunTicks(5);
+
+            await server.WaitAssertion(() =>
             {
                 var generatorComponent = entityMan.GetComponent<GravityGeneratorComponent>(generator);
                 var powerComponent = entityMan.GetComponent<ApcPowerReceiverComponent>(generator);
@@ -76,8 +75,10 @@ namespace Content.IntegrationTests.Tests
                 // Charge rate is ridiculously high so it finishes in one tick.
                 powerComponent.NeedsPower = true;
             });
-            server.RunTicks(1);
-            server.Assert(() =>
+
+            await server.WaitRunTicks(5);
+
+            await server.WaitAssertion(() =>
             {
                 var generatorComponent = entityMan.GetComponent<GravityGeneratorComponent>(generator);
 
@@ -88,7 +89,7 @@ namespace Content.IntegrationTests.Tests
                 Assert.That(entityMan.GetComponent<GravityComponent>(grid2Entity).Enabled, Is.False);
             });
 
-            await server.WaitIdleAsync();
+            await pairTracker.CleanReturnAsync();
         }
     }
 }