Merge branch 'develop' into chore/add_auto_labeler

NoelStephensUnity · web-flow · commit b2f53fd3ce6c · 2025-03-12T23:55:54.000-05:00
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingWorldPositionStaysTests.cs b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingWorldPositionStaysTests.cs
@@ -158,6 +158,8 @@ public enum NetworkTransformSettings
 
         protected override IEnumerator OnSetup()
         {
+            //TODO: Remove this when we determine what the random failure is
+            m_EnableVerboseDebug = true;
             TestComponentHelper.ClientsRegistered.Clear();
             TestComponentHelper.NetworkObjectIdToIndex.Clear();
             for (int i = 0; i < k_NestedChildren; i++)
@@ -169,6 +171,8 @@ protected override IEnumerator OnSetup()
 
         protected override IEnumerator OnTearDown()
         {
+            //TODO: Remove this when we determine what the random failure is
+            m_EnableVerboseDebug = false;
             if (m_ServerSideParent != null && m_ServerSideParent.GetComponent<NetworkObject>().IsSpawned)
             {
                 // Clean up in reverse order (also makes sure we can despawn parents before children)

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,8 @@ public enum NetworkTransformSettings`
`158`	`158`
`159`	`159`	`protected override IEnumerator OnSetup()`
`160`	`160`	`{`
	`161`	`+ //TODO: Remove this when we determine what the random failure is`
	`162`	`+ m_EnableVerboseDebug = true;`
`161`	`163`	`TestComponentHelper.ClientsRegistered.Clear();`
`162`	`164`	`TestComponentHelper.NetworkObjectIdToIndex.Clear();`
`163`	`165`	`for (int i = 0; i < k_NestedChildren; i++)`
`@@ -169,6 +171,8 @@ protected override IEnumerator OnSetup()`
`169`	`171`
`170`	`172`	`protected override IEnumerator OnTearDown()`
`171`	`173`	`{`
	`174`	`+ //TODO: Remove this when we determine what the random failure is`
	`175`	`+ m_EnableVerboseDebug = false;`
`172`	`176`	`if (m_ServerSideParent != null && m_ServerSideParent.GetComponent<NetworkObject>().IsSpawned)`
`173`	`177`	`{`
`174`	`178`	`// Clean up in reverse order (also makes sure we can despawn parents before children)`