chore(bigtable): improve system test instance usage

packages/google-cloud-bigtable/noxfile.py

@@ -309,6 +309,7 @@ def system_emulated(session):
 
     hostport = "localhost:8789"
     session.env["BIGTABLE_EMULATOR_HOST"] = hostport
+    session.env["GOOGLE_CLOUD_PROJECT"] = "emulated-test-project"
 
     p = subprocess.Popen(
         ["gcloud", "beta", "emulators", "bigtable", "start", "--host-port", hostport]

packages/google-cloud-bigtable/tests/system/admin_overlay/test_system_async.py

@@ -347,14 +347,17 @@ async def test_optimize_restored_table(
         admin_v2.StorageType.HDD,
     )
 
-    instance_to_restore, _ = await create_instance(
-        instance_admin_client,
-        table_admin_client,
-        data_client,
-        admin_overlay_project_id,
-        instances_to_delete,
-        second_instance_storage_type,
-    )
+    if second_instance_storage_type == admin_v2.StorageType.HDD:
+        instance_to_restore = instance_with_backup
+    else:
+        instance_to_restore, _ = await create_instance(
+            instance_admin_client,
+            table_admin_client,
+            data_client,
+            admin_overlay_project_id,
+            instances_to_delete,
+            second_instance_storage_type,
+        )
 
     backup = await create_backup(
         instance_admin_client,

packages/google-cloud-bigtable/tests/system/admin_overlay/test_system_autogen.py

@@ -259,14 +259,17 @@ def test_optimize_restored_table(
         instances_to_delete,
         admin_v2.StorageType.HDD,
     )
-    instance_to_restore, _ = create_instance(
-        instance_admin_client,
-        table_admin_client,
-        data_client,
-        admin_overlay_project_id,
-        instances_to_delete,
-        second_instance_storage_type,
-    )
+    if second_instance_storage_type == admin_v2.StorageType.HDD:
+        instance_to_restore = instance_with_backup
+    else:
+        instance_to_restore, _ = create_instance(
+            instance_admin_client,
+            table_admin_client,
+            data_client,
+            admin_overlay_project_id,
+            instances_to_delete,
+            second_instance_storage_type,
+        )
     backup = create_backup(
         instance_admin_client,
         table_admin_client,

packages/google-cloud-bigtable/tests/system/data/__init__.py

@@ -40,8 +40,12 @@ def cleanup_old_instances(self, project_id):
         """
         Automatically deletes any test instances older than 1 day.
         """
+        from google.cloud.environment_vars import BIGTABLE_EMULATOR
         from tests.system.utils import clear_stale_instances
 
+        if os.getenv(BIGTABLE_EMULATOR):
+            return
+
         clear_stale_instances(project_id, "python-bigtable-tests", older_than_days=1)
 
     @pytest.fixture(scope="session")

packages/google-cloud-bigtable/tests/system/utils.py

@@ -12,23 +12,40 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
 from datetime import datetime, timedelta, timezone
 
+from typing import Union, Tuple
+
 from google.api_core.exceptions import NotFound
+from google.cloud.environment_vars import BIGTABLE_EMULATOR
 
 from google.cloud import bigtable_admin_v2 as admin_v2
 
 
-def clear_stale_instances(project_id: str, prefix: str, older_than_days: int = 1):
+def clear_stale_instances(
+    project_id: str,
+    prefix: Union[str, Tuple[str, ...]] = (
+        "python-bigtable-tests",
+        "g-c-p",
+        "admin-overlay-instance",
+    ),
+    older_than_days: int = 1,
+    max_deletions: int = 5,
+):
     """
     Synchronously deletes any instances in the given project that are older
     than older_than_days and whose name or display name matches the given prefix.
     """
+    if os.getenv(BIGTABLE_EMULATOR):
+        return
+    print(f"Clearing stale instances in project {project_id}...")
     client = admin_v2.BigtableInstanceAdminClient(
         client_options={"quota_project_id": project_id}
     )
     parent = client.common_project_path(project_id)
     next_page_token = ""
+    deleted_count = 0
 
     while True:
         try:
@@ -46,12 +63,31 @@ def clear_stale_instances(project_id: str, prefix: str, older_than_days: int = 1
 
             if display_name_matches or name_matches:
                 if instance.create_time:
-                    now = datetime.now(timezone.utc)
-                    if now - instance.create_time > timedelta(days=older_than_days):
-                        try:
-                            client.delete_instance(name=instance.name)
-                        except NotFound:
-                            pass
+                    try:
+                        create_time = instance.create_time
+                        if hasattr(create_time, "to_datetime"):
+                            create_time = create_time.to_datetime()
+                        if create_time.tzinfo is None:
+                            create_time = create_time.replace(tzinfo=timezone.utc)
+                        now = datetime.now(timezone.utc)
+                        if now - create_time > timedelta(days=older_than_days):
+                            try:
+                                print(f"Deleting stale instance: {instance.name}")
+                                client.delete_instance(name=instance.name)
+                                deleted_count += 1
+                                if deleted_count >= max_deletions:
+                                    print(
+                                        f"Reached cap of {max_deletions} stale instance deletions"
+                                    )
+                                    return
+                            except NotFound:
+                                pass
+                            except Exception as e:
+                                print(
+                                    f"Failed to delete stale instance {instance.name}: {e}"
+                                )
+                    except Exception as e:
+                        print(f"Failed to check age for instance {instance.name}: {e}")
 
         next_page_token = response.next_page_token
         if not next_page_token:

packages/google-cloud-bigtable/tests/system/v2_client/test_table_admin.py

@@ -334,23 +334,12 @@ def test_table_backup(
     assert restored_table in tables
     restored_table.delete()
 
-    # Testing `Backup.restore()` into a different instance:
-    # Setting up another instance...
-    alt_instance_id = f"gcp-alt-{unique_suffix}"
-    alt_cluster_id = f"{alt_instance_id}-cluster"
-    alt_instance = admin_client.instance(alt_instance_id, labels=instance_labels)
-    alt_cluster = alt_instance.cluster(
-        cluster_id=alt_cluster_id,
-        location_id=location_id,
-        serve_nodes=1,
+    # Testing `Backup.restore()`:
+    restored_table_id_2 = "test-backup-table-restored-2"
+    restore_op = temp_backup.restore(
+        restored_table_id_2, data_instance_populated.instance_id
     )
-    create_op = alt_instance.create(clusters=[alt_cluster])
-    instances_to_delete.append(alt_instance)
-    create_op.result(timeout=240)
-
-    # Testing `restore()`...
-    restore_op = temp_backup.restore(restored_table_id, alt_instance_id)
     restore_op.result(timeout=240)
-    restored_table = alt_instance.table(restored_table_id)
-    assert restored_table in alt_instance.list_tables()
-    restored_table.delete()
+    restored_table_2 = data_instance_populated.table(restored_table_id_2)
+    assert restored_table_2 in data_instance_populated.list_tables()
+    restored_table_2.delete()