moved back some fixtures

daniel-sanche · daniel-sanche · commit 1fdd7ad5a8b2 · 2025-10-03T13:02:27.000-07:00
diff --git a/tests/system/data/__init__.py b/tests/system/data/__init__.py
@@ -23,11 +23,6 @@
 TEST_AGGREGATE_FAMILY = "test-aggregate-family"
 
 
-# authorized view subset to allow all qualifiers
-ALLOW_ALL = ""
-ALL_QUALIFIERS = {"qualifier_prefixes": [ALLOW_ALL]}
-
-
 class SystemTestRunner:
     """
     configures a system test class with configuration for clusters/tables/etc
@@ -76,124 +71,12 @@ def start_timestamp(self):
         """
         return datetime.datetime.now(datetime.timezone.utc)
 
-    def _generate_table_id(self):
-        return f"test-table-{uuid.uuid4().hex}"
-
-    @pytest.fixture(scope="session")
-    def table_id(
-        self,
-        admin_client,
-        project_id,
-        instance_id,
-        column_family_config,
-        init_table_id,
-        column_split_config,
-        start_timestamp,
-    ):
-        """
-        Returns BIGTABLE_TEST_TABLE if set, otherwise creates a new temporary table for the test session
-
-        Args:
-          - admin_client: Client for interacting with the Table Admin API. Supplied by the admin_client fixture.
-          - project_id: The project ID of the GCP project to test against. Supplied by the project_id fixture.
-          - instance_id: The ID of the Bigtable instance to test against. Supplied by the instance_id fixture.
-          - init_column_families: A list of column families to initialize the table with, if pre-initialized table is not given with BIGTABLE_TEST_TABLE.
-                Supplied by the init_column_families fixture.
-          - init_table_id: The table ID to give to the test table, if pre-initialized table is not given with BIGTABLE_TEST_TABLE.
-                Supplied by the init_table_id fixture.
-          - column_split_config: A list of row keys to use as initial splits when creating the test table.
-          - start_timestamp: accessed when building table to ensure timestamp data is loaded before tests are run
-        """
-        from google.api_core import exceptions
-        from google.api_core import retry
-
-        # use user-specified instance if available
-        user_specified_table = os.getenv("BIGTABLE_TEST_TABLE")
-        if user_specified_table:
-            print("Using user-specified table: {}".format(user_specified_table))
-            yield user_specified_table
-            return
-
-        retry = retry.Retry(
-            predicate=retry.if_exception_type(exceptions.FailedPrecondition)
-        )
-        try:
-            parent_path = f"projects/{project_id}/instances/{instance_id}"
-            print(f"Creating table: {parent_path}/tables/{init_table_id}")
-            admin_client.table_admin_client.create_table(
-                request={
-                    "parent": parent_path,
-                    "table_id": init_table_id,
-                    "table": {"column_families": column_family_config},
-                    "initial_splits": [{"key": key} for key in column_split_config],
-                },
-                retry=retry,
-            )
-        except exceptions.AlreadyExists:
-            pass
-        yield init_table_id
-        print(f"Deleting table: {parent_path}/tables/{init_table_id}")
-        try:
-            admin_client.table_admin_client.delete_table(
-                name=f"{parent_path}/tables/{init_table_id}"
-            )
-        except exceptions.NotFound:
-            print(f"Table {init_table_id} not found, skipping deletion")
-
     @pytest.fixture(scope="session")
-    def authorized_view_id(
-        self,
-        admin_client,
-        project_id,
-        instance_id,
-        table_id,
-    ):
+    def init_table_id(self, start_timestamp):
         """
-        Creates and returns a new temporary authorized view for the test session
+        The table_id to use when creating a new test table
 
-        Args:
-          - admin_client: Client for interacting with the Table Admin API. Supplied by the admin_client fixture.
-          - project_id: The project ID of the GCP project to test against. Supplied by the project_id fixture.
-          - instance_id: The ID of the Bigtable instance to test against. Supplied by the instance_id fixture.
-          - table_id: The ID of the table to create the authorized view for. Supplied by the table_id fixture.
+        Args
+            start_timestamp: accessed when building table to ensure timestamp data is loaded before tests are run
         """
-        from google.api_core import exceptions
-        from google.api_core import retry
-
-        retry = retry.Retry(
-            predicate=retry.if_exception_type(exceptions.FailedPrecondition)
-        )
-        new_view_id = uuid.uuid4().hex[:8]
-        parent_path = f"projects/{project_id}/instances/{instance_id}/tables/{table_id}"
-        new_path = f"{parent_path}/authorizedViews/{new_view_id}"
-        try:
-            print(f"Creating view: {new_path}")
-            admin_client.table_admin_client.create_authorized_view(
-                request={
-                    "parent": parent_path,
-                    "authorized_view_id": new_view_id,
-                    "authorized_view": {
-                        "subset_view": {
-                            "row_prefixes": [ALLOW_ALL],
-                            "family_subsets": {
-                                TEST_FAMILY: ALL_QUALIFIERS,
-                                TEST_FAMILY_2: ALL_QUALIFIERS,
-                                TEST_AGGREGATE_FAMILY: ALL_QUALIFIERS,
-                            },
-                        },
-                    },
-                },
-                retry=retry,
-            )
-        except exceptions.AlreadyExists:
-            pass
-        except exceptions.MethodNotImplemented:
-            # will occur when run in emulator. Pass empty id
-            new_view_id = None
-        yield new_view_id
-        if new_view_id:
-            print(f"Deleting view: {new_path}")
-            try:
-                admin_client.table_admin_client.delete_authorized_view(name=new_path)
-            except exceptions.NotFound:
-                print(f"View {new_view_id} not found, skipping deletion")
+        return f"test-table-{uuid.uuid4().hex}"
diff --git a/tests/system/data/setup_fixtures.py b/tests/system/data/setup_fixtures.py
@@ -20,6 +20,12 @@
 import os
 import uuid
 
+from . import TEST_FAMILY, TEST_FAMILY_2, TEST_AGGREGATE_FAMILY
+
+# authorized view subset to allow all qualifiers
+ALLOW_ALL = ""
+ALL_QUALIFIERS = {"qualifier_prefixes": [ALLOW_ALL]}
+
 
 @pytest.fixture(scope="session")
 def admin_client():
@@ -81,6 +87,123 @@ def column_split_config():
     return [(num * 1000).to_bytes(8, "big") for num in range(1, 10)]
 
 
+@pytest.fixture(scope="session")
+def table_id(
+    admin_client,
+    project_id,
+    instance_id,
+    column_family_config,
+    init_table_id,
+    column_split_config,
+):
+    """
+    Returns BIGTABLE_TEST_TABLE if set, otherwise creates a new temporary table for the test session
+
+    Args:
+        admin_client: Client for interacting with the Table Admin API. Supplied by the admin_client fixture.
+        project_id: The project ID of the GCP project to test against. Supplied by the project_id fixture.
+        instance_id: The ID of the Bigtable instance to test against. Supplied by the instance_id fixture.
+        init_column_families: A list of column families to initialize the table with, if pre-initialized table is not given with BIGTABLE_TEST_TABLE.
+            Supplied by the init_column_families fixture.
+        init_table_id: The table ID to give to the test table, if pre-initialized table is not given with BIGTABLE_TEST_TABLE.
+            Supplied by the init_table_id fixture.
+        column_split_config: A list of row keys to use as initial splits when creating the test table.
+    """
+    from google.api_core import exceptions
+    from google.api_core import retry
+
+    # use user-specified instance if available
+    user_specified_table = os.getenv("BIGTABLE_TEST_TABLE")
+    if user_specified_table:
+        print("Using user-specified table: {}".format(user_specified_table))
+        yield user_specified_table
+        return
+
+    retry = retry.Retry(
+        predicate=retry.if_exception_type(exceptions.FailedPrecondition)
+    )
+    try:
+        parent_path = f"projects/{project_id}/instances/{instance_id}"
+        print(f"Creating table: {parent_path}/tables/{init_table_id}")
+        admin_client.table_admin_client.create_table(
+            request={
+                "parent": parent_path,
+                "table_id": init_table_id,
+                "table": {"column_families": column_family_config},
+                "initial_splits": [{"key": key} for key in column_split_config],
+            },
+            retry=retry,
+        )
+    except exceptions.AlreadyExists:
+        pass
+    yield init_table_id
+    print(f"Deleting table: {parent_path}/tables/{init_table_id}")
+    try:
+        admin_client.table_admin_client.delete_table(
+            name=f"{parent_path}/tables/{init_table_id}"
+        )
+    except exceptions.NotFound:
+        print(f"Table {init_table_id} not found, skipping deletion")
+
+
+@pytest.fixture(scope="session")
+def authorized_view_id(
+    admin_client,
+    project_id,
+    instance_id,
+    table_id,
+):
+    """
+    Creates and returns a new temporary authorized view for the test session
+
+    Args:
+        admin_client: Client for interacting with the Table Admin API. Supplied by the admin_client fixture.
+        project_id: The project ID of the GCP project to test against. Supplied by the project_id fixture.
+        instance_id: The ID of the Bigtable instance to test against. Supplied by the instance_id fixture.
+        table_id: The ID of the table to create the authorized view for. Supplied by the table_id fixture.
+    """
+    from google.api_core import exceptions
+    from google.api_core import retry
+
+    retry = retry.Retry(
+        predicate=retry.if_exception_type(exceptions.FailedPrecondition)
+    )
+    new_view_id = uuid.uuid4().hex[:8]
+    parent_path = f"projects/{project_id}/instances/{instance_id}/tables/{table_id}"
+    new_path = f"{parent_path}/authorizedViews/{new_view_id}"
+    try:
+        print(f"Creating view: {new_path}")
+        admin_client.table_admin_client.create_authorized_view(
+            request={
+                "parent": parent_path,
+                "authorized_view_id": new_view_id,
+                "authorized_view": {
+                    "subset_view": {
+                        "row_prefixes": [ALLOW_ALL],
+                        "family_subsets": {
+                            TEST_FAMILY: ALL_QUALIFIERS,
+                            TEST_FAMILY_2: ALL_QUALIFIERS,
+                            TEST_AGGREGATE_FAMILY: ALL_QUALIFIERS,
+                        },
+                    },
+                },
+            },
+            retry=retry,
+        )
+    except exceptions.AlreadyExists:
+        pass
+    except exceptions.MethodNotImplemented:
+        # will occur when run in emulator. Pass empty id
+        new_view_id = None
+    yield new_view_id
+    if new_view_id:
+        print(f"Deleting view: {new_path}")
+        try:
+            admin_client.table_admin_client.delete_authorized_view(name=new_path)
+        except exceptions.NotFound:
+            print(f"View {new_view_id} not found, skipping deletion")
+
+
 @pytest.fixture(scope="session")
 def project_id(client):
     """Returns the project ID from the client."""
diff --git a/tests/system/data/test_metrics_async.py b/tests/system/data/test_metrics_async.py
@@ -214,13 +214,6 @@ async def temp_rows(self, table):
         yield builder
         await builder.delete_rows()
 
-    @pytest.fixture(scope="session")
-    def init_table_id(self):
-        """
-        The table_id to use when creating a new test table
-        """
-        return self._generate_table_id()
-
     @CrossSync.convert
     @CrossSync.pytest_fixture(scope="session")
     async def table(self, client, table_id, instance_id, handler):
diff --git a/tests/system/data/test_metrics_autogen.py b/tests/system/data/test_metrics_autogen.py
@@ -168,11 +168,6 @@ def temp_rows(self, table):
         yield builder
         builder.delete_rows()
 
-    @pytest.fixture(scope="session")
-    def init_table_id(self):
-        """The table_id to use when creating a new test table"""
-        return self._generate_table_id()
-
     @pytest.fixture(scope="session")
     def table(self, client, table_id, instance_id, handler):
         with client.get_table(instance_id, table_id) as table:
diff --git a/tests/system/data/test_system_async.py b/tests/system/data/test_system_async.py
@@ -18,7 +18,7 @@
 import uuid
 import os
 from google.api_core import retry
-from google.api_core.exceptions import ClientError, PermissionDenied
+from google.api_core.exceptions import ClientError, PermissionDenied, ServerError
 
 from google.cloud.bigtable.data.execute_query.metadata import SqlType
 from google.cloud.bigtable.data.read_modify_write_rules import _MAX_INCREMENT_VALUE
@@ -164,16 +164,6 @@ def event_loop(self):
         loop.stop()
         loop.close()
 
-    @pytest.fixture(scope="session")
-    def init_table_id(self):
-        """
-        The table_id to use when creating a new test table
-        """
-        base_id = self._generate_table_id()
-        if CrossSync.is_async:
-            base_id = f"{base_id}-async"
-        return base_id
-
     def _make_client(self):
         project = os.getenv("GOOGLE_CLOUD_PROJECT") or None
         return CrossSync.DataClient(project=project)
@@ -1354,7 +1344,7 @@ def metrics_client(self, client):
             ("application_blocking_latencies", [OperationType.READ_ROWS]),
         ],
     )
-    @retry.Retry(predicate=retry.if_exception_type(AssertionError))
+    @retry.Retry(predicate=retry.if_exception_type(AssertionError, ServerError))
     def test_metric_existence(
         self, client, table_id, metrics_client, start_timestamp, metric, methods
     ):
diff --git a/tests/system/data/test_system_autogen.py b/tests/system/data/test_system_autogen.py
@@ -20,7 +20,7 @@
 import uuid
 import os
 from google.api_core import retry
-from google.api_core.exceptions import ClientError, PermissionDenied
+from google.api_core.exceptions import ClientError, PermissionDenied, ServerError
 from google.cloud.bigtable.data.execute_query.metadata import SqlType
 from google.cloud.bigtable.data.read_modify_write_rules import _MAX_INCREMENT_VALUE
 from google.cloud.bigtable.data._metrics import OperationType
@@ -127,12 +127,6 @@ def create_row_and_mutation(
 
 
 class TestSystem(SystemTestRunner):
-    @pytest.fixture(scope="session")
-    def init_table_id(self):
-        """The table_id to use when creating a new test table"""
-        base_id = self._generate_table_id()
-        return base_id
-
     def _make_client(self):
         project = os.getenv("GOOGLE_CLOUD_PROJECT") or None
         return CrossSync._Sync_Impl.DataClient(project=project)
@@ -1098,7 +1092,7 @@ def metrics_client(self, client):
             ("application_blocking_latencies", [OperationType.READ_ROWS]),
         ],
     )
-    @retry.Retry(predicate=retry.if_exception_type(AssertionError))
+    @retry.Retry(predicate=retry.if_exception_type(AssertionError, ServerError))
     def test_metric_existence(
         self, client, table_id, metrics_client, start_timestamp, metric, methods
     ):
