From 775fd23e7e312c341ec89dd8358fdcf7eb8500c6 Mon Sep 17 00:00:00 2001
From: chalmer lowe <chalmerlowe@google.com>
Date: Wed, 8 Jul 2026 12:59:44 -0400
Subject: [PATCH] feat: cleanup stale databases in spanner system tests

---
 .../tests/system/_helpers.py                  | 28 +++++++++++++++++--
 .../tests/system/conftest.py                  |  3 +-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/packages/google-cloud-spanner/tests/system/_helpers.py b/packages/google-cloud-spanner/tests/system/_helpers.py
index 4cd9879e5d2d..2a4ae64f9e67 100644
--- a/packages/google-cloud-spanner/tests/system/_helpers.py
+++ b/packages/google-cloud-spanner/tests/system/_helpers.py
@@ -17,10 +17,10 @@
 import time
 import uuid
 
-from google.api_core import exceptions
+from google.api_core import datetime_helpers, exceptions
+from google.cloud.spanner_v1 import instance as instance_mod
 from test_utils import retry
 
-from google.cloud.spanner_v1 import instance as instance_mod
 from tests import _fixtures
 
 CREATE_INSTANCE_ENVVAR = "GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE"
@@ -159,6 +159,30 @@ def cleanup_old_instances(spanner_client):
                 scrub_instance_ignore_not_found(instance)
 
 
+def cleanup_stale_databases(instance, cutoff_seconds=600):
+    """Delete stale databases in the given instance older than cutoff_seconds."""
+    cutoff_ms = (int(time.time()) - cutoff_seconds) * 1000
+
+    for database_pb in instance.list_databases():
+        if database_pb.create_time is not None:
+            create_time_ms = datetime_helpers.to_milliseconds(database_pb.create_time)
+
+            if create_time_ms < cutoff_ms:
+                db = instance.database(database_pb.name.split("/")[-1])
+                try:
+                    db.reload()
+                    if db.enable_drop_protection:
+                        db.enable_drop_protection = False
+                        operation = db.update(["enable_drop_protection"])
+                        operation.result(DATABASE_OPERATION_TIMEOUT_IN_SECONDS)
+                    db.drop()
+                except exceptions.NotFound:
+                    pass
+                except exceptions.GoogleAPIError:
+                    # Ignore other API errors during cleanup
+                    pass
+
+
 def unique_id(prefix, separator="-"):
     # Database name size: Spanner database names are limited to 30 characters.
     # See: https://docs.cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.database.v1#createdatabaserequest
diff --git a/packages/google-cloud-spanner/tests/system/conftest.py b/packages/google-cloud-spanner/tests/system/conftest.py
index 740cfc0e02b5..39bc8a5bcae2 100644
--- a/packages/google-cloud-spanner/tests/system/conftest.py
+++ b/packages/google-cloud-spanner/tests/system/conftest.py
@@ -17,7 +17,6 @@
 import time
 
 import pytest
-
 from google.cloud import spanner_v1
 from google.cloud.spanner_admin_database_v1 import DatabaseDialect
 from google.cloud.spanner_admin_database_v1.types.backup import (
@@ -218,6 +217,8 @@ def shared_instance(
         instance = spanner_client.instance(shared_instance_id)
         instance.reload()
 
+    _helpers.cleanup_stale_databases(instance)
+
     yield instance
 
     if _helpers.CREATE_INSTANCE: