SG-43825 use ephemeral project as control for schema visibility tests

Author: jay-roe

tests/test_api.py

@@ -3322,31 +3322,27 @@ def test_modify_visibility(self):
         if field_name not in schema:
             self.sg.schema_field_create("Asset", "text", "Project Visibility Test")
 
-        # Grab any two projects that we can use for toggling the visible property with.
-        projects = self.sg.find(
-            "Project", [], order=[{"field_name": "id", "direction": "asc"}]
-        )
-        project_1 = projects[0]
-        project_2 = projects[1]
-
-        def assert_visibility(project, expected, retries=5, delay=1):
-            """Poll until schema_field_read reflects the expected visibility value."""
-            result = None
-            for _ in range(retries):
-                result = self.sg.schema_field_read("Asset", field_name, project)[
-                    field_name
-                ]["visible"]
-                if result == expected:
-                    return
-                time.sleep(delay)
-            self.assertEqual(expected, result)
+        # Hide/show on the ephemeral CI project so concurrent matrix jobs do not race.
+        # Use the oldest site project as the control.
+        project_1 = self.project
+        project_2 = self.sg.find_one("Project", [])
 
         # First, reset the field visibility in a known state, i.e. visible for both projects,
         # in case the last test run failed midway through.
         self.sg.schema_field_update("Asset", field_name, {"visible": True}, project_1)
-        assert_visibility(project_1, {"value": True, "editable": True})
+        self.assertEqual(
+            {"value": True, "editable": True},
+            self.sg.schema_field_read("Asset", field_name, project_1)[field_name][
+                "visible"
+            ],
+        )
         self.sg.schema_field_update("Asset", field_name, {"visible": True}, project_2)
-        assert_visibility(project_2, {"value": True, "editable": True})
+        self.assertEqual(
+            {"value": True, "editable": True},
+            self.sg.schema_field_read("Asset", field_name, project_2)[field_name][
+                "visible"
+            ],
+        )
 
         # Built-in fields should remain not editable.
         self.assertFalse(
@@ -3362,7 +3358,12 @@ def assert_visibility(project, expected, retries=5, delay=1):
         # Hide the field on project 1
         self.sg.schema_field_update("Asset", field_name, {"visible": False}, project_1)
         # It should not be visible anymore.
-        assert_visibility(project_1, {"value": False, "editable": True})
+        self.assertEqual(
+            {"value": False, "editable": True},
+            self.sg.schema_field_read("Asset", field_name, project_1)[field_name][
+                "visible"
+            ],
+        )
 
         # The field should be visible on the second project.
         self.assertEqual(
@@ -3374,7 +3375,12 @@ def assert_visibility(project, expected, retries=5, delay=1):
 
         # Restore the visibility on the field.
         self.sg.schema_field_update("Asset", field_name, {"visible": True}, project_1)
-        assert_visibility(project_1, {"value": True, "editable": True})
+        self.assertEqual(
+            {"value": True, "editable": True},
+            self.sg.schema_field_read("Asset", field_name, project_1)[field_name][
+                "visible"
+            ],
+        )
 
 
 class TestLibImports(base.LiveTestBase):