From 5ec72082bbff3c0c14cdba4925485260d7130933 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Thu, 22 Dec 2022 08:26:03 +1300
Subject: [PATCH] Fix tests (#3605)

---
 Robust.UnitTesting/RobustIntegrationTest.cs         |  4 ++++
 .../Shared/GameObjects/ContainerTests.cs            | 13 ++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Robust.UnitTesting/RobustIntegrationTest.cs b/Robust.UnitTesting/RobustIntegrationTest.cs
index 59bfc4821..8dbb8d958 100644
--- a/Robust.UnitTesting/RobustIntegrationTest.cs
+++ b/Robust.UnitTesting/RobustIntegrationTest.cs
@@ -11,6 +11,8 @@ using System.Threading.Tasks;
 using Moq;
 using NUnit.Framework;
 using Robust.Client;
+using Robust.Client.GameStates;
+using Robust.Client.Timing;
 using Robust.Server;
 using Robust.Server.Console;
 using Robust.Server.ServerStatus;
@@ -757,6 +759,8 @@ namespace Robust.UnitTesting
                 ClientIoC.RegisterIoC(GameController.DisplayMode.Headless, deps);
                 deps.Register<INetManager, IntegrationNetManager>(true);
                 deps.Register<IClientNetManager, IntegrationNetManager>(true);
+                deps.Register<IGameStateProcessor, GameStateProcessor>(true);
+                deps.Register<IClientGameTiming, ClientGameTiming>(true);
                 deps.Register<IntegrationNetManager, IntegrationNetManager>(true);
                 deps.Register<IModLoader, TestingModLoader>(true);
                 deps.Register<IModLoaderInternal, TestingModLoader>(true);
diff --git a/Robust.UnitTesting/Shared/GameObjects/ContainerTests.cs b/Robust.UnitTesting/Shared/GameObjects/ContainerTests.cs
index 64bd4ca8a..3a519f8db 100644
--- a/Robust.UnitTesting/Shared/GameObjects/ContainerTests.cs
+++ b/Robust.UnitTesting/Shared/GameObjects/ContainerTests.cs
@@ -2,6 +2,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using Robust.Client.GameObjects;
+using Robust.Client.GameStates;
+using Robust.Client.Timing;
 using Robust.Server.GameObjects;
 using Robust.Server.Maps;
 using Robust.Server.Player;
@@ -10,6 +12,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
+using Robust.Shared.Timing;
 using MapSystem = Robust.Server.GameObjects.MapSystem;
 
 // ReSharper disable AccessToStaticMemberViaDerivedType
@@ -210,9 +213,13 @@ namespace Robust.UnitTesting.Shared.GameObjects
                  entMan.GetComponent<TransformComponent>(itemUid).LocalPosition = (100000, 0);
              });
 
-             // Needs minimum 4 to sync to client because buffer size is 3
-             await server.WaitRunTicks(1);
-             await client.WaitRunTicks(4);
+            await server.WaitRunTicks(1);
+            var serverTime = server.ResolveDependency<IGameTiming>();
+            var clientTime = client.ResolveDependency<IClientGameTiming>();
+            while (clientTime.LastRealTick < serverTime.CurTick - 1)
+            {
+                await client.WaitRunTicks(1);
+            }
 
              await client.WaitAssertion(() =>
              {