Fix tests

EmandM · EmandM · commit ba725dab7d4d · 2025-05-29T14:32:32.000-04:00
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ClientConnectedMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ClientConnectedMessage.cs
@@ -31,9 +31,9 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
         public void Handle(ref NetworkContext context)
         {
             var networkManager = (NetworkManager)context.SystemOwner;
-            if (ShouldSynchronize && networkManager.NetworkConfig.EnableSceneManagement && networkManager.DistributedAuthorityMode && networkManager.LocalClient.IsSessionOwner)
+            if (ShouldSynchronize && networkManager.NetworkConfig.EnableSceneManagement && networkManager.DistributedAuthorityMode && !networkManager.CMBServiceConnection && networkManager.LocalClient.IsSessionOwner)
             {
-                // networkManager.SceneManager.SynchronizeNetworkObjects(ClientId);
+                networkManager.SceneManager.SynchronizeNetworkObjects(ClientId);
             }
             else
             {
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ConnectionApprovedMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ConnectionApprovedMessage.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Unity.Collections;
+using UnityEngine;
 
 namespace Unity.Netcode
 {
@@ -251,7 +252,7 @@ public void Handle(ref NetworkContext context)
                 NetworkLog.LogInfo($"[Client-{OwnerClientId}] Connection approved! Synchronizing...");
             }
 
-            if (networkManager.CMBServiceConnection && networkManager.LocalClient.IsSessionOwner)
+            if (networkManager.CMBServiceConnection && networkManager.LocalClient.IsSessionOwner && networkManager.NetworkConfig.EnableSceneManagement && networkManager.LocalClientId != OwnerClientId)
             {
                 networkManager.SceneManager.SynchronizeNetworkObjects(OwnerClientId);
                 return;
@@ -332,6 +333,7 @@ public void Handle(ref NetworkContext context)
                 {
                     NetworkLog.LogInfo($"[Client-{OwnerClientId}][Scene Management Disabled] Synchronization complete!");
                 }
+
                 // When scene management is disabled we notify after everything is synchronized
                 networkManager.ConnectionManager.InvokeOnClientConnectedCallback(OwnerClientId);
 
@@ -374,6 +376,7 @@ public void Handle(ref NetworkContext context)
                     }
                 }
             }
+
             ConnectedClientIds.Dispose();
         }
     }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/NetworkManagerHooks.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/NetworkManagerHooks.cs
@@ -76,7 +76,6 @@ public bool OnVerifyCanReceive(ulong senderId, Type messageType, FastBufferReade
 
                 if (m_NetworkManager.ConnectedClients.TryGetValue(senderId, out NetworkClient connectedClient) && messageType == typeof(ConnectionRequestMessage))
                 {
-
                     if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                     {
                         var transportErrorMsg = GetTransportErrorMessage(messageContent, m_NetworkManager);
@@ -99,7 +98,8 @@ public bool OnVerifyCanReceive(ulong senderId, Type messageType, FastBufferReade
                     return false;
                 }
 
-                if (m_NetworkManager.IsConnectedClient && messageType == typeof(ConnectionApprovedMessage) && !(m_NetworkManager.CMBServiceConnection && m_NetworkManager.LocalClient.IsSessionOwner))
+                if (m_NetworkManager.IsConnectedClient && messageType == typeof(ConnectionApprovedMessage) &&
+                    !(m_NetworkManager.CMBServiceConnection && m_NetworkManager.LocalClient.IsSessionOwner && m_NetworkManager.NetworkConfig.EnableSceneManagement))
                 {
                     if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                     {
diff --git a/com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs
@@ -2581,6 +2581,14 @@ private void HandleSessionOwnerEvent(uint sceneEventId, ulong clientId)
                         // Mark this client as being connected
                         NetworkManager.ConnectedClients[clientId].IsConnected = true;
 
+                        // Notify that a client has finished synchronizing
+                        OnSceneEvent?.Invoke(new SceneEvent()
+                        {
+                            SceneEventType = sceneEventData.SceneEventType,
+                            ClientId = clientId
+                        });
+                        OnSynchronizeComplete?.Invoke(clientId);
+
                         // For non-authority clients in a distributed authority session, we show hidden objects,
                         // we distribute NetworkObjects, and then we end the scene event.
                         if (NetworkManager.DistributedAuthorityMode && !NetworkManager.LocalClient.IsSessionOwner)
@@ -2599,16 +2607,6 @@ private void HandleSessionOwnerEvent(uint sceneEventId, ulong clientId)
                             return;
                         }
 
-                        // All scenes are synchronized, let the server know we are done synchronizing
-
-                        // Notify the local server that a client has finished synchronizing
-                        OnSceneEvent?.Invoke(new SceneEvent()
-                        {
-                            SceneEventType = sceneEventData.SceneEventType,
-                            ClientId = clientId
-                        });
-                        OnSynchronizeComplete?.Invoke(clientId);
-
                         // At this time the client is fully synchronized with all loaded scenes and
                         // NetworkObjects and should be considered "fully connected". Send the
                         // notification that the client is connected.
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/ExtendedNetworkShowAndHideTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/ExtendedNetworkShowAndHideTests.cs
@@ -6,12 +6,18 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    [TestFixture(HostOrServer.DAHost, true)]
-    [TestFixture(HostOrServer.DAHost, false)]
+    [TestFixture(HostOrServer.DAHost, Config.SceneManagementEnabled)]
+    [TestFixture(HostOrServer.DAHost, Config.SceneManagementDisabled)]
     public class ExtendedNetworkShowAndHideTests : NetcodeIntegrationTest
     {
+        public enum Config
+        {
+            SceneManagementEnabled,
+            SceneManagementDisabled,
+        }
+
         protected override int NumberOfClients => 3;
-        private bool m_EnableSceneManagement;
+        private readonly bool m_EnableSceneManagement;
         private GameObject m_ObjectToSpawn;
         private NetworkObject m_SpawnedObject;
         private NetworkManager m_ClientToHideFrom;
@@ -25,9 +31,9 @@ protected override bool UseCMBService()
             return false;
         }
 
-        public ExtendedNetworkShowAndHideTests(HostOrServer hostOrServer, bool enableSceneManagement) : base(hostOrServer)
+        public ExtendedNetworkShowAndHideTests(HostOrServer hostOrServer, Config enableSceneManagement) : base(hostOrServer)
         {
-            m_EnableSceneManagement = enableSceneManagement;
+            m_EnableSceneManagement = enableSceneManagement == Config.SceneManagementEnabled;
         }
 
         protected override void OnServerAndClientsCreated()
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/SceneManagementSynchronizationTests.cs b/testproject/Assets/Tests/Runtime/NetworkSceneManager/SceneManagementSynchronizationTests.cs
@@ -192,14 +192,28 @@ public IEnumerator SynchronizationCallbacks_NonAuthority()
         [UnityTest]
         public IEnumerator LateJoiningClient_PeerCallbacks()
         {
-            SetManagerToTest(GetNonAuthorityNetworkManager());
+            var nonAuthority = GetNonAuthorityNetworkManager();
+            var expectedClientId = nonAuthority.LocalClientId + 1;
+            SetManagerToTest(nonAuthority);
             // Setup expected events
+            if (m_UseCmbService)
+            {
+                m_ExpectedEventQueue.Enqueue(new ExpectedEvent()
+                {
+                    SceneEvent = new SceneEvent()
+                    {
+                        SceneEventType = SceneEventType.SynchronizeComplete,
+                        ClientId = expectedClientId,
+                    },
+                });
+            }
+
             m_ExpectedEventQueue.Enqueue(new ExpectedEvent()
             {
                 ConnectionEvent = new ConnectionEventData()
                 {
                     EventType = ConnectionEvent.PeerConnected,
-                    ClientId = m_ManagerToTest.LocalClientId + 1,
+                    ClientId = expectedClientId,
                 }
             });
 

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int`
`31`	`31`	`public void Handle(ref NetworkContext context)`
`32`	`32`	`{`
`33`	`33`	`var networkManager = (NetworkManager)context.SystemOwner;`
`34`		`- if (ShouldSynchronize && networkManager.NetworkConfig.EnableSceneManagement && networkManager.DistributedAuthorityMode && networkManager.LocalClient.IsSessionOwner)`
	`34`	`+ if (ShouldSynchronize && networkManager.NetworkConfig.EnableSceneManagement && networkManager.DistributedAuthorityMode && !networkManager.CMBServiceConnection && networkManager.LocalClient.IsSessionOwner)`
`35`	`35`	`{`
`36`		`- // networkManager.SceneManager.SynchronizeNetworkObjects(ClientId);`
	`36`	`+ networkManager.SceneManager.SynchronizeNetworkObjects(ClientId);`
`37`	`37`	`}`
`38`	`38`	`else`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using Unity.Collections;`
	`3`	`+using UnityEngine;`
`3`	`4`
`4`	`5`	`namespace Unity.Netcode`
`5`	`6`	`{`
`@@ -251,7 +252,7 @@ public void Handle(ref NetworkContext context)`
`251`	`252`	`NetworkLog.LogInfo($"[Client-{OwnerClientId}] Connection approved! Synchronizing...");`
`252`	`253`	`}`
`253`	`254`
`254`		`- if (networkManager.CMBServiceConnection && networkManager.LocalClient.IsSessionOwner)`
	`255`	`+ if (networkManager.CMBServiceConnection && networkManager.LocalClient.IsSessionOwner && networkManager.NetworkConfig.EnableSceneManagement && networkManager.LocalClientId != OwnerClientId)`
`255`	`256`	`{`
`256`	`257`	`networkManager.SceneManager.SynchronizeNetworkObjects(OwnerClientId);`
`257`	`258`	`return;`
`@@ -332,6 +333,7 @@ public void Handle(ref NetworkContext context)`
`332`	`333`	`{`
`333`	`334`	`NetworkLog.LogInfo($"[Client-{OwnerClientId}][Scene Management Disabled] Synchronization complete!");`
`334`	`335`	`}`
	`336`	`+`
`335`	`337`	`// When scene management is disabled we notify after everything is synchronized`
`336`	`338`	`networkManager.ConnectionManager.InvokeOnClientConnectedCallback(OwnerClientId);`
`337`	`339`
`@@ -374,6 +376,7 @@ public void Handle(ref NetworkContext context)`
`374`	`376`	`}`
`375`	`377`	`}`
`376`	`378`	`}`
	`379`	`+`
`377`	`380`	`ConnectedClientIds.Dispose();`
`378`	`381`	`}`
`379`	`382`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ public bool OnVerifyCanReceive(ulong senderId, Type messageType, FastBufferReade`
`76`	`76`
`77`	`77`	`if (m_NetworkManager.ConnectedClients.TryGetValue(senderId, out NetworkClient connectedClient) && messageType == typeof(ConnectionRequestMessage))`
`78`	`78`	`{`
`79`		`-`
`80`	`79`	`if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)`
`81`	`80`	`{`
`82`	`81`	`var transportErrorMsg = GetTransportErrorMessage(messageContent, m_NetworkManager);`
`@@ -99,7 +98,8 @@ public bool OnVerifyCanReceive(ulong senderId, Type messageType, FastBufferReade`
`99`	`98`	`return false;`
`100`	`99`	`}`
`101`	`100`
`102`		`- if (m_NetworkManager.IsConnectedClient && messageType == typeof(ConnectionApprovedMessage) && !(m_NetworkManager.CMBServiceConnection && m_NetworkManager.LocalClient.IsSessionOwner))`
	`101`	`+ if (m_NetworkManager.IsConnectedClient && messageType == typeof(ConnectionApprovedMessage) &&`
	`102`	`+ !(m_NetworkManager.CMBServiceConnection && m_NetworkManager.LocalClient.IsSessionOwner && m_NetworkManager.NetworkConfig.EnableSceneManagement))`
`103`	`103`	`{`
`104`	`104`	`if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)`
`105`	`105`	`{`