Run tests against release rust build

Author: EmandM

.yamato/desktop-standalone-tests.yml

@@ -91,7 +91,7 @@ desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
   commands:
 # If ubuntu, run rust echo server (This is needed ONLY for NGOv2.X because relates to Distributed Authority)
 {% if platform.name != "win" %} # Issues with win and mac are tracked in MTT-11606
-    - ./Tools/CI/rust.sh
+    - ./Tools/CI/run_cmb_service.sh
 {% endif %}
 
     - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models

Tools/CI/rust.sh Tools/CI/run_cmb_service.shTools/CI/rust.sh renamed to Tools/CI/run_cmb_service.sh

@@ -12,8 +12,8 @@ cargo build --example ngo_echo_server
 # Run the echo server in the background - this will reuse the artifacts from the build
 cargo run --example ngo_echo_server -- --port $ECHO_SERVER_PORT &
 
-# Build the standalone server
-cargo build
+# Build a release version of the standalone server
+cargo build --release --locked
 
 # Run the standalone server on an infinite loop in the background
-while :; do cargo run -- --metrics-port 5000 standalone --port $COMB_SERVER_PORT -t 60m; done &
+while :; do ./target/release/comb-server --metrics-port 5000 standalone --port $COMB_SERVER_PORT -t 60m; done &

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

@@ -96,9 +96,14 @@ public static void DeregisterNetworkObject(ulong localClientId, ulong networkObj
             }
         }
 
-        protected int TotalClients => m_UseHost ? NumberOfClients + 1 : NumberOfClients;
+        /// <summary>
+        /// Total number of clients that should be connected at any point during a test
+        /// </summary>
+        protected int TotalClients => m_UseHost ? m_NumberOfClients + 1 : m_NumberOfClients;
 
         protected const uint k_DefaultTickRate = 30;
+
+        private int m_NumberOfClients;
         protected abstract int NumberOfClients { get; }
 
         /// <summary>
@@ -420,7 +425,7 @@ public IEnumerator SetUp()
 
             if (m_SetupIsACoroutine)
             {
-                yield return NetcodeIntegrationTestHelpers.WaitBetweenCmbServiceTests(m_UseCmbService);
+                // yield return NetcodeIntegrationTestHelpers.WaitBetweenCmbServiceTests(m_UseCmbService);
                 yield return OnSetup();
             }
             else

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

@@ -1015,26 +1015,6 @@ private static IEnumerator ExecuteWaitForHook(MessageHandleCheckWithResult check
             result.Result = res;
         }
 
-
-        private static bool s_PreviousWasCmbServiceTest;
-
-        /// <summary>
-        /// Waits for a second if the previous and current tests are using the hosted CMB Service.
-        /// This is necessary as the CMB Service does not restart fast enough when running multiple tests.
-        /// </summary>
-        /// <param name="isCmbServiceTest">Whether the currently running test is running against a hosted CMB service instance</param>
-        /// <returns>An <see cref="IEnumerator"/> that will wait for a second</returns>
-        public static IEnumerator WaitBetweenCmbServiceTests(bool isCmbServiceTest)
-        {
-            if (isCmbServiceTest && s_PreviousWasCmbServiceTest)
-            {
-                // TODO: [CmbServiceTests] investigate whether we can reduce this timeout
-                yield return new WaitForSeconds(1f);
-            }
-
-            s_PreviousWasCmbServiceTest = isCmbServiceTest;
-        }
-
 #if UNITY_EDITOR
         public static void SetRefreshAllPrefabsCallback(Action scenesProcessed)
         {

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

@@ -21,7 +21,7 @@ internal class PlayerObjectTests : NetcodeIntegrationTest
         // TODO: [CmbServiceTests] Clients are disconnecting in a way that makes the cmb service slow to close and restart
         protected override bool UseCMBService()
         {
-            return false;
+            return true;
         }
         public PlayerObjectTests(HostOrServer hostOrServer) : base(hostOrServer) { }
 
@@ -78,7 +78,7 @@ internal class PlayerSpawnNoObserversTest : NetcodeIntegrationTest
         // TODO: [CmbServiceTests] Clients are disconnecting in a way that makes the cmb service slow to close and restart
         protected override bool UseCMBService()
         {
-            return false;
+            return true;
         }
         public PlayerSpawnNoObserversTest(HostOrServer hostOrServer) : base(hostOrServer) { }
 
@@ -144,7 +144,7 @@ internal class PlayerSpawnPositionTests : IntegrationTestWithApproximation
         // TODO: [CmbServiceTests] Clients are disconnecting in a way that makes the cmb service slow to close and restart
         protected override bool UseCMBService()
         {
-            return false;
+            return true;
         }
         public PlayerSpawnPositionTests(HostOrServer hostOrServer) : base(hostOrServer) { }
 
@@ -218,7 +218,7 @@ internal class PlayerSpawnAndDespawnTests : NetcodeIntegrationTest
         // TODO: [CmbServiceTests] Clients are disconnecting in a way that makes the cmb service slow to close and restart
         protected override bool UseCMBService()
         {
-            return false;
+            return true;
         }
 
         public PlayerSpawnAndDespawnTests(HostOrServer hostOrServer) : base(hostOrServer) { }