Skip to content

Commit f45df03

Browse files
committed
Merge branch 'test/multiprocess-tests/execute-step-in-context' into test/multiprocess-tests/adding-perf-tests-for-spawn
* test/multiprocess-tests/execute-step-in-context: Apply suggestions from code review fix/cleanup asmdefs again
2 parents fad69e8 + 933df82 commit f45df03

File tree

3 files changed

+11
-19
lines changed

3 files changed

+11
-19
lines changed

com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.multiplayer.mlapi.runtimetests.asmdef

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
"optionalUnityReferences": [
99
"TestAssemblies"
1010
],
11-
"includePlatforms": [],
12-
"excludePlatforms": []
11+
"defineConstraints": [
12+
"UNITY_INCLUDE_TESTS",
13+
"UNITY_EDITOR"
14+
]
1315
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static void StartWorkerNode()
3434
workerNode.StartInfo.FileName = $"{buildPath}.exe";
3535
break;
3636
default:
37-
throw new NotImplementedException("StartWorkerNode: Current platform not supported");
37+
throw new NotImplementedException($"{nameof(StartWorkerNode)}: Current platform is not supported");
3838
}
3939
}
4040
catch (FileNotFoundException)
@@ -53,7 +53,7 @@ public static void StartWorkerNode()
5353
var newProcessStarted = workerNode.Start();
5454
if (!newProcessStarted)
5555
{
56-
throw new Exception("Process not started!");
56+
throw new Exception("Failed to start process!");
5757
}
5858
}
5959
catch (Win32Exception e)
Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,15 @@
11
{
22
"name": "TestProject.RuntimeTests",
3-
"rootNamespace": "",
43
"references": [
5-
"Unity.Multiplayer.MLAPI.Runtime",
6-
"Unity.Multiplayer.MLAPI.RuntimeTests",
74
"TestProject.ManualTests",
8-
"UnityEngine.TestRunner",
9-
"UnityEditor.TestRunner"
5+
"Unity.Multiplayer.MLAPI.Runtime",
6+
"Unity.Multiplayer.MLAPI.RuntimeTests"
107
],
11-
"includePlatforms": [],
12-
"excludePlatforms": [],
13-
"allowUnsafeCode": false,
14-
"overrideReferences": true,
15-
"precompiledReferences": [
16-
"nunit.framework.dll"
8+
"optionalUnityReferences": [
9+
"TestAssemblies"
1710
],
18-
"autoReferenced": false,
1911
"defineConstraints": [
2012
"UNITY_INCLUDE_TESTS",
2113
"UNITY_EDITOR"
22-
],
23-
"versionDefines": [],
24-
"noEngineReferences": false
14+
]
2515
}

0 commit comments

Comments
 (0)