Skip to content

Commit fbfcc94

Browse files
authored
chore: expose --verbosity through standards.py (#1085)
1 parent 4c166a6 commit fbfcc94

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

com.unity.netcode.gameobjects/Tests/Editor/Metrics/NetworkMetricsRegistrationTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if MULTIPLAYER_TOOLS
1+
#if MULTIPLAYER_TOOLS
22

33
using System;
44
using System.Linq;
@@ -40,4 +40,4 @@ public void ValidateThatAllMetricTypesAreRegistered(Type metricType)
4040
}
4141
}
4242

43-
#endif
43+
#endif

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace Unity.Netcode.RuntimeTests
1616
public class NetworkPrefabHandlerTests
1717
{
1818

19-
private const string k_TestPrefabObjectName = "NetworkPrefabTestObject";
19+
private const string k_TestPrefabObjectName = "NetworkPrefabTestObject";
2020
private uint m_GlobalObjectIdHashBase = 123456;
2121
private GameObject MakeValidNetworkPrefab()
2222
{
@@ -43,7 +43,7 @@ public void NetworkConfigInvalidNetworkPrefabTest()
4343

4444
// Add a NetworkPrefab override with an invalid hash
4545
NetworkManagerHelper.NetworkManagerObject.NetworkConfig.NetworkPrefabs.Add(new NetworkPrefab() { Override = NetworkPrefabOverride.Hash, SourceHashToOverride = 0 });
46-
46+
4747
// Add a NetworkPrefab override with a valid hash but an invalid target prefab
4848
NetworkManagerHelper.NetworkManagerObject.NetworkConfig.NetworkPrefabs.Add(new NetworkPrefab() { Override = NetworkPrefabOverride.Hash, SourceHashToOverride = 654321, OverridingTargetPrefab = null });
4949

standards.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
parser.add_argument("--fix", action="store_true")
1717
parser.add_argument("--yamato", action="store_true")
1818

19+
parser.add_argument("--verbosity", default="minimal")
1920
parser.add_argument("--tool-path", default="dotnet-format")
2021
parser.add_argument("--project-path", default="testproject")
2122
parser.add_argument("--project-glob", default="*.sln")
@@ -102,7 +103,7 @@
102103
any_error = False
103104
for project_file in glob_files:
104105
print(f"check: project -> {project_file}")
105-
any_error = 0 != os.system(f"{args.tool_path} {project_file} --fix-whitespace --fix-style error --check") or any_error
106+
any_error = 0 != os.system(f"{args.tool_path} {project_file} --fix-whitespace --fix-style error --check --verbosity {args.verbosity}") or any_error
106107

107108
if any_error:
108109
exit("check: failed")
@@ -116,7 +117,7 @@
116117
any_error = False
117118
for project_file in glob_files:
118119
print(f"fix: project -> {project_file}")
119-
any_error = 0 != os.system(f"{args.tool_path} {project_file} --fix-whitespace --fix-style error") or any_error
120+
any_error = 0 != os.system(f"{args.tool_path} {project_file} --fix-whitespace --fix-style error --verbosity {args.verbosity}") or any_error
120121

121122
if any_error:
122123
exit("fix: failed")
@@ -128,7 +129,7 @@
128129

129130
for project_file in glob_files:
130131
print(f"yamato: project -> {project_file}")
131-
yamato_exec = os.system(f"{args.tool_path} {project_file} --fix-style error --check")
132+
yamato_exec = os.system(f"{args.tool_path} {project_file} --fix-style error --check --verbosity {args.verbosity}")
132133
if yamato_exec != 0:
133134
exit(f"yamato: failed, exit code -> {yamato_exec}")
134135

testproject/Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObjectComponent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class EnableDisableSceneNetworkObjectComponent : NetworkBehaviour
1919

2020
private void Start()
2121
{
22-
if(m_ActivateObjectButton != null)
22+
if (m_ActivateObjectButton != null)
2323
{
2424
m_ButtonText = m_ActivateObjectButton.GetComponentInChildren<Text>();
2525
if (m_ButtonText != null)

testproject/Assets/Tests/Runtime/NetworkSceneManagerTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace TestProject.RuntimeTests
1313
{
14-
public class NetworkSceneManagerTests: BaseMultiInstanceTest
14+
public class NetworkSceneManagerTests : BaseMultiInstanceTest
1515
{
1616
protected override int NbClients => 9;
1717

@@ -224,15 +224,15 @@ private void SetClientWaitDone(List<ulong> clients)
224224
private bool ContainsAllClients(List<ulong> clients)
225225
{
226226
// First, make sure we have the expected client count
227-
if(clients.Count != m_ShouldWaitList.Count)
227+
if (clients.Count != m_ShouldWaitList.Count)
228228
{
229229
return false;
230230
}
231231

232232
// Next, make sure we have all client identifiers
233-
foreach(var sceneTestInfo in m_ShouldWaitList)
233+
foreach (var sceneTestInfo in m_ShouldWaitList)
234234
{
235-
if(!clients.Contains(sceneTestInfo.ClientId))
235+
if (!clients.Contains(sceneTestInfo.ClientId))
236236
{
237237
return false;
238238
}
@@ -248,12 +248,12 @@ private bool ContainsAllClients(List<ulong> clients)
248248
/// <param name="sceneEvent"></param>
249249
private void SceneManager_OnSceneEvent(SceneEvent sceneEvent)
250250
{
251-
switch(sceneEvent.SceneEventType)
251+
switch (sceneEvent.SceneEventType)
252252
{
253253
case SceneEventData.SceneEventTypes.S2C_Load:
254254
case SceneEventData.SceneEventTypes.S2C_Unload:
255255
{
256-
Assert.AreEqual(sceneEvent.SceneName,m_CurrentSceneName);
256+
Assert.AreEqual(sceneEvent.SceneName, m_CurrentSceneName);
257257
Assert.IsTrue(ContainsClient(sceneEvent.ClientId));
258258
Assert.IsNotNull(sceneEvent.AsyncOperation);
259259
break;

0 commit comments

Comments
 (0)