Merge branch 'develop' into feat/add-builtin-pose-serialization

Author: EmandM

.yamato/_triggers.yml

@@ -43,18 +43,23 @@
 # Since standards job is a part of initial checks it's not present as direct dependency here
 pull_request_trigger:
   name: Pull Request Trigger (develop, develop-2.0.0, & release branches)
+  # Run the following tests on a selection of different desktop platforms
   dependencies:
-    # Run package EditMode and Playmode package tests on trunk
-    - .yamato/_run-all.yml#run_all_package_tests_trunk
-    # Run package EditMode and Playmode package tests on minimum supported editor (2021.3 in case of NGOv1.X)
-    - .yamato/_run-all.yml#run_all_package_tests_2021
-    # Run project EditMode and PLaymode project tests on trunk 
-    - .yamato/_run-all.yml#run_all_project_tests_trunk
-    # Run project EditMode and PLaymode project tests on minimum supported editor (2021.3 in case of NGOv1.X)
-    - .yamato/_run-all.yml#run_all_project_tests_2021
+    # Run package EditMode and Playmode package tests on trunk and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor)
+    - .yamato/package-tests.yml#package_test_-_ngo_trunk_mac
+    - .yamato/package-tests.yml#package_test_-_ngo_2022.3_win
+
+    # Run testproject EditMode and Playmode project tests on trunk and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor)
+    - .yamato/project-tests.yml#test_testproject_win_trunk
+    - .yamato/project-tests.yml#test_testproject_mac_2022.3
+
+    # Run tools integration tests EditMode and Playmode tests on trunk and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor)
+    - .yamato/project-tests.yml#test_testproject-tools-integration_ubuntu_2022.3
+    - .yamato/project-tests.yml#test_testproject-tools-integration_win_trunk
+
     # Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon
     # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs
-    - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_2021.3
+    - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_2022.3
   triggers:
     cancel_old_ci: true
     pull_requests:
@@ -64,7 +69,7 @@ pull_request_trigger:
             - "develop-2.0.0"
             - "/release\/.*/"
       - drafts: false
-            
+
 
 # Run all tests on trunk on nightly basis.
 # Same subset as pull_request_trigger with addition of mobile/desktop/console tests and webgl builds
@@ -85,7 +90,7 @@ develop_nightly:
     # Run package EditMode and Playmode tests on desktop platforms on trunk and 2021.3
     - .yamato/_run-all.yml#run_all_package_tests_trunk
     - .yamato/_run-all.yml#run_all_package_tests_2021
-    # Run project EditMode and PLaymode tests on desktop platforms on trunk and 2021.3 
+    # Run project EditMode and PLaymode tests on desktop platforms on trunk and 2021.3
     - .yamato/_run-all.yml#run_all_project_tests_trunk
     - .yamato/_run-all.yml#run_all_project_tests_2021
     # Run Runtime tests on desktop players on trunk and 2021 editors
@@ -132,4 +137,4 @@ develop_weekly_trunk:
     # Build player for webgl platform on trunk
     - .yamato/_run-all.yml#run_all_webgl_builds
     # Run code coverage test
-    - .yamato/code-coverage.yml#code_coverage_ubuntu_trunk
+    - .yamato/code-coverage.yml#code_coverage_ubuntu_trunk

.yamato/project.metafile

@@ -159,6 +159,7 @@ validation_editors:
         - 2022.3
         - 6000.0
         - 6000.1 
+        - 6000.2
         - trunk
 
 

com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/PlayerSpawnObjectVisibilityTests.cs

@@ -13,7 +13,6 @@ namespace Unity.Netcode.RuntimeTests
     internal class PlayerSpawnObjectVisibilityTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 0;
-
         public enum PlayerSpawnStages
         {
             OnNetworkSpawn,
@@ -63,6 +62,25 @@ protected override void OnCreatePlayerPrefab()
             base.OnCreatePlayerPrefab();
         }
 
+        /// <summary>
+        /// Bypassing this on v1.x as the deferred show message could be processed on the next
+        /// frame from when the client registers having connected.
+        /// </summary>
+        protected override bool ShouldWaitForNewClientToConnect(NetworkManager networkManager)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Validate that the player object is spawned on the client side.
+        /// </summary>
+        /// <returns></returns>
+        private bool ClientSpawnedPlayer()
+        {
+            var playerObject = m_ClientNetworkManagers[0].LocalClient.PlayerObject;
+            return playerObject != null && playerObject.IsSpawned && playerObject.IsOwner;
+        }
+
         /// <summary>
         /// Tests the scenario where under a client-server network topology if a player prefab
         /// is spawned by the server with no observers but the player prefab itself has server
@@ -81,7 +99,17 @@ public IEnumerator NetworkShowOnSpawnTest([Values] PlayerSpawnStages spawnStage)
 
             yield return CreateAndStartNewClient();
 
-            yield return new WaitForSeconds(0.25f);
+            // Wait for the new client to connect
+            yield return WaitForClientsConnectedOrTimeOut();
+            AssertOnTimeout($"Timed out waiting for client to connect!");
+            OnNewClientStartedAndConnected(m_ClientNetworkManagers[0]);
+
+            // Wait for the new client to have spawned the player
+            yield return WaitForConditionOrTimeOut(ClientSpawnedPlayer);
+            AssertOnTimeout($"Timed out waiting for client to spawn its player object!");
+
+            // Provide some time to assure there are no additional attempts to spawn the same instance
+            yield return new WaitForSeconds(0.5f);
 
             NetcodeLogAssert.LogWasNotReceived(LogType.Warning, new Regex("but it is already in the spawned list!"));
             var client = m_ClientNetworkManagers[0];