test: remote config support for multiprocesstestscene (#1931)

* integrate multi-machine testing code

* Reconfigure how host/client ip/port is set

* PR feedback

* Undetected compilation error

* update to use async await

* use async await

* Use async/await and avoid call to Wait()

* Clean up whitespace as well as remove calls to Wait()

* only whitespace

* attempt to move setting up StartClient to support async config

* Continued experiments

* Start client after the configuration has been set

* Use notifications and callbacks instead of waits to enable TestCoordinator when the connection is complete

* Make startclient call explicit

* Test Coordinator cleanup for INotifyPropertyChanged

* Fix whitespace

* Fix whitespace, simplify

Co-authored-by: Noel Stephens <[email protected]>

Author: zain-mecklai

testproject/Assets/Scenes/MultiprocessTestScene.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657838, g: 0.49641234, b: 0.57481676, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -212,7 +212,6 @@ Transform:
   m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
   m_LocalPosition: {x: 0, y: 3, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 1
@@ -223,8 +222,8 @@ LightingSettings:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name:
-  serializedVersion: 4
+  m_Name: 
+  serializedVersion: 3
   m_GIWorkflowMode: 1
   m_EnableBakedLightmaps: 1
   m_EnableRealtimeLightmaps: 0
@@ -237,7 +236,7 @@ LightingSettings:
   m_LightmapMaxSize: 1024
   m_BakeResolution: 40
   m_Padding: 2
-  m_LightmapCompression: 3
+  m_TextureCompression: 1
   m_AO: 0
   m_AOMaxDistance: 1
   m_CompAOExponent: 1
@@ -278,7 +277,6 @@ LightingSettings:
   m_PVRFilteringAtrousPositionSigmaDirect: 0.5
   m_PVRFilteringAtrousPositionSigmaIndirect: 2
   m_PVRFilteringAtrousPositionSigmaAO: 1
-  m_PVRTiledBaking: 0
 --- !u!1 &160940364
 GameObject:
   m_ObjectHideFlags: 0
@@ -371,7 +369,6 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -10, y: -10, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 5
@@ -405,10 +402,10 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 04cf3cc1396054b009a1ed283aa50021, type: 3}
-  m_Name:
-  m_EditorClassIdentifier:
+  m_Name: 
+  m_EditorClassIdentifier: 
   IsTestCoordinatorActiveAndEnabled: 0
-  CommandLineArguments:
+  CommandLineArguments: 
 --- !u!102 &430011405
 TextMesh:
   serializedVersion: 3
@@ -481,9 +478,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 430011403}
   m_LocalRotation: {x: 0.2164396, y: 0, z: 0, w: 0.97629607}
-  m_LocalPosition: {x: -40, y: 0, z: 10}
+  m_LocalPosition: {x: -45, y: 10, z: 10}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 7
@@ -567,7 +563,6 @@ Transform:
   m_LocalRotation: {x: 0.21736304, y: -0, z: -0, w: 0.97609085}
   m_LocalPosition: {x: 0, y: 9.15, z: -27.5}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -664,7 +659,6 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 4
@@ -761,7 +755,6 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 10, y: 10, z: 10}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 3
@@ -795,8 +788,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 593a2fe42fa9d37498c96f9a383b6521, type: 3}
-  m_Name:
-  m_EditorClassIdentifier:
+  m_Name: 
+  m_EditorClassIdentifier: 
   RunInBackground: 1
   LogLevel: 1
   NetworkConfig:
@@ -814,7 +807,7 @@ MonoBehaviour:
     TickRate: 30
     ClientConnectionBufferTimeout: 10
     ConnectionApproval: 0
-    ConnectionData:
+    ConnectionData: 
     EnableTimeResync: 0
     TimeResyncInterval: 30
     EnsureNetworkVariableLengthSafety: 0
@@ -836,7 +829,6 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1674777072}
   - {fileID: 2027640072}
@@ -853,8 +845,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 068bf11ceb1344667af4cc40950f44f4, type: 3}
-  m_Name:
-  m_EditorClassIdentifier:
+  m_Name: 
+  m_EditorClassIdentifier: 
   ReferencedPrefab: {fileID: 9115731988109684252, guid: c2851feb7276442cc86a6f2d1d69ea11,
     type: 3}
 --- !u!114 &1211923378
@@ -867,8 +859,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 55d1c75ce242745ac98f7e7aca6d2d19, type: 3}
-  m_Name:
-  m_EditorClassIdentifier:
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1274245423
 GameObject:
   m_ObjectHideFlags: 0
@@ -897,8 +889,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
-  m_Name:
-  m_EditorClassIdentifier:
+  m_Name: 
+  m_EditorClassIdentifier: 
   GlobalObjectIdHash: 2217825759
   AlwaysReplicateAsRoot: 0
   DontDestroyWithOwner: 0
@@ -913,7 +905,6 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 10, y: 10, z: 10}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 6
@@ -928,8 +919,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: ef1240e0784f84eadb77fe822e2e03c7, type: 3}
-  m_Name:
-  m_EditorClassIdentifier:
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1674777071
 GameObject:
   m_ObjectHideFlags: 0
@@ -957,7 +948,6 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1211923376}
   m_RootOrder: 0
@@ -972,8 +962,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: b84c2d8dfe509a34fb59e2b81f8e1319, type: 3}
-  m_Name:
-  m_EditorClassIdentifier:
+  m_Name: 
+  m_EditorClassIdentifier: 
   MessageBufferSize: 50000
   MaxConnections: 100
   MaxSentMessageQueueSize: 50000
@@ -1008,7 +998,6 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1211923376}
   m_RootOrder: 1
@@ -1023,8 +1012,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 6960e84d07fb87f47956e7a81d71c4e6, type: 3}
-  m_Name:
-  m_EditorClassIdentifier:
+  m_Name: 
+  m_EditorClassIdentifier: 
   m_ProtocolType: 0
   m_MaxPacketQueueSize: 128
   m_MaxPayloadSize: 4096
@@ -1036,7 +1025,7 @@ MonoBehaviour:
   ConnectionData:
     Address: 127.0.0.1
     Port: 7777
-    ServerListenAddress:
+    ServerListenAddress: 
   DebugSimulator:
     PacketDelayMS: 0
     PacketJitterMS: 0

testproject/Assets/Tests/Runtime/MultiprocessRuntime/BaseMultiprocessTests.cs

@@ -5,6 +5,9 @@
 using UnityEngine.SceneManagement;
 using UnityEngine.TestTools;
 using Object = UnityEngine.Object;
+using Unity.Netcode.Transports.UNET;
+using Unity.Netcode.Transports.UTP;
+
 
 namespace Unity.Netcode.MultiprocessRuntimeTests
 {
@@ -77,6 +80,27 @@ private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
                 SceneManager.SetActiveScene(scene);
             }
 
+            var transport = NetworkManager.Singleton.NetworkConfig.NetworkTransport;
+            MultiprocessLogger.Log($"transport is {transport}");
+            switch (transport)
+            {
+                case UNetTransport unetTransport:
+                    unetTransport.ConnectPort = int.Parse(TestCoordinator.Port);
+                    unetTransport.ServerListenPort = int.Parse(TestCoordinator.Port);
+                    unetTransport.ConnectAddress = "127.0.0.1";
+                    MultiprocessLogger.Log($"Setting ConnectAddress to {unetTransport.ConnectAddress} port {unetTransport.ConnectPort}, {unetTransport.ServerListenPort}");
+
+                    break;
+                case UnityTransport unityTransport:
+                    unityTransport.ConnectionData.ServerListenAddress = "0.0.0.0";
+                    MultiprocessLogger.Log($"Setting unityTransport.ConnectionData.Port {unityTransport.ConnectionData.ServerListenAddress}");
+                    break;
+                default:
+                    MultiprocessLogger.LogError($"The transport {transport} has no case");
+                    break;
+            }
+
+            MultiprocessLogger.Log("Starting Host");
             NetworkManager.Singleton.StartHost();
 
             // Use scene verification to make sure we don't try to get clients to synchronize the TestRunner scene

testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/ConfigurationTools.cs

@@ -0,0 +1,69 @@
+using UnityEngine;
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Unity.Netcode.MultiprocessRuntimeTests
+{
+    public class ConfigurationTools
+    {
+        public static async Task<JobQueueItemArray> GetRemoteConfig()
+        {
+            var theList = new JobQueueItemArray();
+            using var client = new HttpClient();
+            var cancelAfterDelay = new CancellationTokenSource(TimeSpan.FromSeconds(10));
+            var response = await client.GetAsync("https://multiprocess-log-event-manager.cds.internal.unity3d.com/api/JobWithFile",
+                HttpCompletionOption.ResponseHeadersRead, cancelAfterDelay.Token).ConfigureAwait(false);
+            var content = await response.Content.ReadAsStringAsync();
+            JsonUtility.FromJsonOverwrite(content, theList);
+            return theList;
+        }
+
+        public static async void CompleteJobQueueItem(JobQueueItem item)
+        {
+            await PostJobQueueItem(item, "/complete");
+        }
+
+        public static async void ClaimJobQueueItem(JobQueueItem item)
+        {
+            await PostJobQueueItem(item, "/claim");
+        }
+
+        public static async Task PostJobQueueItem(JobQueueItem item, string path = "")
+        {
+            using var client = new HttpClient();
+            using var request = new HttpRequestMessage(HttpMethod.Post, "https://multiprocess-log-event-manager.cds.internal.unity3d.com/api/JobWithFile" + path);
+            var json = JsonUtility.ToJson(item);
+            using var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
+            request.Content = stringContent;
+            MultiprocessLogger.Log($"Posting remoteConfig to server {json}");
+            var cancelAfterDelay = new CancellationTokenSource(TimeSpan.FromSeconds(20));
+            var response = await client
+                .SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancelAfterDelay.Token).ConfigureAwait(false);
+            MultiprocessLogger.Log($"remoteConfig posted, checking response {response.StatusCode}");
+        }
+    }
+
+    [Serializable]
+    public class JobQueueItemArray
+    {
+        public List<JobQueueItem> JobQueueItems;
+    }
+
+    [Serializable]
+    public class JobQueueItem
+    {
+        public int Id;
+        public long JobId;
+        public string GitHash;
+        public string HostIp;
+        public int PlatformId;
+        public int JobStateId;
+        public string CreatedBy;
+        public string UpdatedBy;
+        public string TransportName;
+    }
+}

testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/ConfigurationTools.cs.meta

@@ -0,0 +1,9 @@
+
+public enum ConfigurationType
+{
+    Unknown,
+    Remote,
+    CommandLine,
+    ResourceFile,
+    Host
+}

testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/ConfigurationType.cs

@@ -28,6 +28,18 @@ public static void LogWarning(string msg)
 
     public class MultiprocessLogHandler : ILogHandler
     {
+        public static long JobId;
+        static MultiprocessLogHandler()
+        {
+            if (JobId == 0)
+            {
+                string sJobId = Environment.GetEnvironmentVariable("YAMATO_JOB_ID");
+                if (!long.TryParse(sJobId, out JobId))
+                {
+                    JobId = -2;
+                }
+            }
+        }
         public void LogException(Exception exception, UnityEngine.Object context)
         {
             Debug.unityLogger.LogException(exception, context);

testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/ConfigurationType.cs.meta

@@ -117,7 +117,7 @@ public static string StartWorkerNode()
                 case RuntimePlatform.WindowsEditor:
                     workerProcess.StartInfo.FileName = $"{buildPath}.exe";
                     //extraArgs += "-popupwindow -screen-width 100 -screen-height 100";
-                    extraArgs += "-batchmode -nographics";
+                    extraArgs += "-popupwindow";
                     break;
                 case RuntimePlatform.LinuxPlayer:
                 case RuntimePlatform.LinuxEditor: