test - fix

Going to see if this resolves the issue with 2021.3 windows validation and the memory disposed error message.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Tests/Runtime/ConnectionApprovalTimeoutTests.cs

@@ -2,6 +2,7 @@
 using System.Text.RegularExpressions;
 using NUnit.Framework;
 using Unity.Netcode.TestHelpers.Runtime;
+using Unity.Netcode.Transports.UTP;
 using UnityEngine;
 using UnityEngine.TestTools;
 
@@ -55,20 +56,28 @@ protected override void OnServerAndClientsCreated()
             base.OnServerAndClientsCreated();
         }
 
+        private MessageCatcher<ConnectionRequestMessage> m_ConnectionRequestCatcher;
+        private MessageCatcher<ConnectionApprovedMessage> m_ConnectionApprovedCatcher;
         protected override IEnumerator OnStartedServerAndClients()
         {
+            m_ClientStopped = false;
+            m_ServerStopped = false;
+            m_ClientNetworkManagers[0].OnClientStopped += OnClientStopped;
+            m_ServerNetworkManager.OnServerStopped += OnServerStopped;
             if (m_ApprovalFailureType == ApprovalTimedOutTypes.ServerDoesNotRespond)
             {
                 // We catch (don't process) the incoming approval message to simulate the server not sending the approved message in time
-                m_ClientNetworkManagers[0].ConnectionManager.MessageManager.Hook(new MessageCatcher<ConnectionApprovedMessage>(m_ClientNetworkManagers[0]));
+                m_ConnectionApprovedCatcher = new MessageCatcher<ConnectionApprovedMessage>(m_ClientNetworkManagers[0], m_EnableVerboseDebug);
+                m_ClientNetworkManagers[0].ConnectionManager.MessageManager.Hook(m_ConnectionApprovedCatcher);
                 m_ExpectedLogMessage = new Regex("Timed out waiting for the server to approve the connection request.");
                 m_LogType = LogType.Log;
             }
             else
             {
                 // We catch (don't process) the incoming connection request message to simulate a transport connection but the client never
                 // sends (or takes too long to send) the connection request.
-                m_ServerNetworkManager.ConnectionManager.MessageManager.Hook(new MessageCatcher<ConnectionRequestMessage>(m_ServerNetworkManager));
+                m_ConnectionRequestCatcher = new MessageCatcher<ConnectionRequestMessage>(m_ServerNetworkManager, m_EnableVerboseDebug);
+                m_ServerNetworkManager.ConnectionManager.MessageManager.Hook(m_ConnectionRequestCatcher);
 
                 // For this test, we know the timed out client will be Client-1
                 m_ExpectedLogMessage = new Regex("Server detected a transport connection from Client-1, but timed out waiting for the connection request message.");
@@ -98,6 +107,43 @@ public IEnumerator ValidateApprovalTimeout()
 
             Assert.AreEqual(0, m_ServerNetworkManager.ConnectionManager.PendingClients.Count, $"Expected no pending clients when there were {m_ServerNetworkManager.ConnectionManager.PendingClients.Count} pending clients!");
             Assert.True(!m_ClientNetworkManagers[0].LocalClient.IsApproved, $"Expected the client to not have been approved, but it was!");
+
+            if (m_ApprovalFailureType == ApprovalTimedOutTypes.ServerDoesNotRespond)
+            {
+                m_ConnectionApprovedCatcher.ClearMessages();
+            }
+            else
+            {
+                m_ConnectionRequestCatcher.ClearMessages();
+            }
+
+            if (!m_ClientStopped)
+            {
+                m_ClientNetworkManagers[0].Shutdown();
+            }
+
+            if (!m_ServerStopped)
+            {
+                m_ServerNetworkManager.Shutdown();
+            }
+
+            yield return WaitForConditionOrTimeOut(() => m_ClientStopped && m_ServerStopped);
+            AssertOnTimeout($"Timed out waiting for the client or server to stop!");
+        }
+
+        private bool m_ClientStopped;
+        private void OnClientStopped(bool obj)
+        {
+            m_ClientNetworkManagers[0].OnClientStopped -= OnClientStopped;
+            m_ClientStopped = true;
         }
+
+        private bool m_ServerStopped;
+        private void OnServerStopped(bool obj)
+        {
+            m_ServerNetworkManager.OnServerStopped -= OnServerStopped;
+            m_ServerStopped = true;
+        }
+
     }
 }

com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/MessageCatcher.cs

@@ -1,14 +1,17 @@
 using System;
 using System.Collections.Generic;
 using Unity.Collections;
+using UnityEngine;
 
 namespace Unity.Netcode.RuntimeTests
 {
     internal class MessageCatcher<TMessageType> : INetworkHooks where TMessageType : INetworkMessage
     {
         private NetworkManager m_OwnerNetworkManager;
 
-        public MessageCatcher(NetworkManager ownerNetworkManager)
+        private bool m_VerboseDebug;
+
+        public MessageCatcher(NetworkManager ownerNetworkManager, bool verboseDebug = false)
         {
             m_OwnerNetworkManager = ownerNetworkManager;
         }
@@ -23,9 +26,38 @@ private struct TriggerData
         }
         private readonly List<TriggerData> m_CaughtMessages = new List<TriggerData>();
 
-        public void ReleaseMessages()
+
+        private void Log(string message)
         {
+            if (!m_VerboseDebug)
+            {
+                return;
+            }
 
+            Debug.Log($"[Client-{m_OwnerNetworkManager.LocalClientId}] {message}");
+        }
+
+        internal void ClearMessages()
+        {
+            if (m_CaughtMessages.Count == 0)
+            {
+                return;
+            }
+            Log($"Clearing messages.");
+            foreach (var caughtSpawn in m_CaughtMessages)
+            {
+                if (caughtSpawn.Reader.IsInitialized)
+                {
+                    Log($"Disposing reader (size: {caughtSpawn.Reader.Length}).");
+                    caughtSpawn.Reader.Dispose();
+                }
+            }
+
+            m_CaughtMessages.Clear();
+        }
+
+        public void ReleaseMessages()
+        {
             foreach (var caughtSpawn in m_CaughtMessages)
             {
                 // Reader will be disposed within HandleMessage