Fix integration test helpers

Author: EmandM

com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTest.cs

@@ -1669,37 +1669,21 @@ public bool WaitForConditionOrTimeOutWithTimeTravel(IConditionalPredicate condit
             return success;
         }
 
-        /// <summary>
-        /// Waits until the specified condition returns true or a timeout occurs, then asserts if the timeout was reached.
-        /// </summary>
-        /// <param name="checkForCondition">A delegate that returns true when the desired condition is met.</param>
-        /// <param name="timeoutErrorMessage">The error message to include in the assertion if the timeout is reached.</param>
-        /// <param name="timeOutHelper">An optional <see cref="TimeoutHelper"/> to control the timeout period. If null, the default timeout is used.</param>
-        /// <returns>An <see cref="IEnumerator"/> for use in Unity coroutines.</returns>
-        protected IEnumerator WaitForConditionOrAssert(Func<bool> checkForCondition, string timeoutErrorMessage, TimeoutHelper timeOutHelper = null)
-        {
-            yield return WaitForConditionOrTimeOut(checkForCondition, timeOutHelper);
-            AssertOnTimeout(timeoutErrorMessage, timeOutHelper);
-        }
-
         /// <summary>
         /// Waits until the specified condition returns true or a timeout occurs, then asserts if the timeout was reached.
         /// This overload allows the condition to provide additional error details via a <see cref="StringBuilder"/>.
         /// </summary>
         /// <param name="checkForCondition">A delegate that takes a <see cref="StringBuilder"/> for error details and returns true when the desired condition is met.</param>
-        /// <param name="timeoutErrorMessage">The error message to include in the assertion if the timeout is reached. The information on the StringBuilder will be appended on a new line</param>
         /// <param name="timeOutHelper">An optional <see cref="TimeoutHelper"/> to control the timeout period. If null, the default timeout is used.</param>
         /// <returns>An <see cref="IEnumerator"/> for use in Unity coroutines.</returns>
-        protected IEnumerator WaitForConditionOrAssert(Func<StringBuilder, bool> checkForCondition, string timeoutErrorMessage, TimeoutHelper timeOutHelper = null)
+        protected IEnumerator WaitForConditionOrTimeOut(Func<StringBuilder, bool> checkForCondition, TimeoutHelper timeOutHelper = null)
         {
-            var errorBuilder = new StringBuilder();
             yield return WaitForConditionOrTimeOut(() =>
             {
                 // Clear errorBuilder before each check to ensure the errorBuilder only contains information from the lastest run
-                errorBuilder.Clear();
-                return checkForCondition(errorBuilder);
+                m_InternalErrorLog.Clear();
+                return checkForCondition(m_InternalErrorLog);
             }, timeOutHelper);
-            AssertOnTimeout($"{timeoutErrorMessage}\n{errorBuilder}", timeOutHelper);
         }
 
         /// <summary>
@@ -2057,7 +2041,14 @@ private void InitializeTestConfiguration(NetworkTopologyTypes networkTopologyTyp
         protected void AssertOnTimeout(string timeOutErrorMessage, TimeoutHelper assignedTimeoutHelper = null)
         {
             var timeoutHelper = assignedTimeoutHelper ?? s_GlobalTimeoutHelper;
-            Assert.False(timeoutHelper.TimedOut, timeOutErrorMessage);
+
+            if (m_InternalErrorLog.Length > 0)
+            {
+                Assert.False(timeoutHelper.TimedOut, $"{timeOutErrorMessage}\n{m_InternalErrorLog}");
+                m_InternalErrorLog.Clear();
+            }
+
+            Assert.False(timeoutHelper.TimedOut, $"{timeOutErrorMessage}");
         }
 
 

testproject/Assets/Tests/Runtime/NetworkSceneManager/OnSceneEventCallbackTests.cs

@@ -106,7 +106,8 @@ private IEnumerator RunSceneEventCallbackTest(ClientType clientType, Action acti
                 // Load the scene initially
                 authority.SceneManager.LoadScene(k_SceneToLoad, LoadSceneMode.Additive);
 
-                yield return WaitForConditionOrAssert(ValidateSceneIsLoaded, $"[Setup] Timed out waiting for client to load the scene {k_SceneToLoad}!");
+                yield return WaitForConditionOrTimeOut(ValidateSceneIsLoaded);
+                AssertOnTimeout($"[Setup] Timed out waiting for client to load the scene {k_SceneToLoad}!");
 
                 // Wait for any pending messages to be processed
                 yield return null;
@@ -179,14 +180,16 @@ private IEnumerator RunSceneEventCallbackTest(ClientType clientType, Action acti
             {
                 Assert.That(authority.SceneManager.LoadScene(loadCall, LoadSceneMode.Additive) == SceneEventProgressStatus.Started);
 
-                yield return WaitForConditionOrAssert(ValidateSceneIsLoaded, $"[Test] Timed out waiting for client to load the scene {k_SceneToLoad}!");
+                yield return WaitForConditionOrTimeOut(ValidateSceneIsLoaded);
+                AssertOnTimeout($"[Test] Timed out waiting for client to load the scene {k_SceneToLoad}!");
             }
             else
             {
                 Assert.That(loadedScene.name, Is.EqualTo(k_SceneToLoad), "scene was not loaded!");
                 Assert.That(authority.SceneManager.UnloadScene(loadedScene) == SceneEventProgressStatus.Started);
 
-                yield return WaitForConditionOrAssert(ValidateSceneIsUnloaded, $"[Test] Timed out waiting for client to unload the scene {k_SceneToLoad}!");
+                yield return WaitForConditionOrTimeOut(ValidateSceneIsUnloaded);
+                AssertOnTimeout($"[Test] Timed out waiting for client to unload the scene {k_SceneToLoad}!");
             }
 
             // Wait for all messages to process
@@ -219,7 +222,7 @@ private bool ValidateSceneIsLoaded(StringBuilder errorBuilder)
                 }
             }
 
-            return true;
+            return false;
         }
 
         private bool ValidateSceneIsUnloaded()