transient when isolating server

Author: provinzkraut

src/pytest_databases/docker/bigquery.py

@@ -18,7 +18,7 @@
 
 
 @pytest.fixture(scope="session")
-def xdist_bigquery_isolate() -> XdistIsolationLevel:
+def xdist_bigquery_isolation_level() -> XdistIsolationLevel:
     return "database"
 
 
@@ -40,7 +40,7 @@ def client_options(self) -> ClientOptions:
 @pytest.fixture(autouse=False, scope="session")
 def bigquery_service(
     docker_service: DockerService,
-    xdist_bigquery_isolate: XdistIsolationLevel,
+    xdist_bigquery_isolation_level: XdistIsolationLevel,
 ) -> Generator[BigQueryService, None, None]:
     project = "emulator-test-project"
     dataset = "test-dataset"
@@ -61,7 +61,7 @@ def check(_service: ServiceContainer) -> bool:
             return False
 
     container_name = "bigquery"
-    if xdist_bigquery_isolate == "server":
+    if xdist_bigquery_isolation_level == "server":
         container_name = f"{container_name}_{get_xdist_worker_id()}"
     else:
         worker_id = get_xdist_worker_id()
@@ -79,6 +79,7 @@ def check(_service: ServiceContainer) -> bool:
         },
         container_port=9050,
         timeout=60,
+        transient=xdist_bigquery_isolation_level == "server",
     ) as service:
         yield BigQueryService(
             host=service.host,

src/pytest_databases/docker/cockroachdb.py

@@ -65,6 +65,7 @@ def cockroachdb_responsive(_service: ServiceContainer) -> bool:
         name=container_name,
         command="start-single-node --insecure",
         exec_after_start=f'cockroach sql --insecure -e "CREATE DATABASE {db_name}";',
+        transient=cockroachdb_xdist_isolation_level == "server",
     ) as service:
         yield CockroachDBService(
             host=service.host,

src/pytest_databases/docker/dragonfly.py

@@ -68,5 +68,6 @@ def dragonfly_service(
         check=dragonfly_responsive,
         container_port=6379,
         name=name,
+        transient=xdist_dragonfly_isolation_level == "server",
     ) as service:
         yield DragonflyService(host=service.host, port=service.port, db=db)

src/pytest_databases/docker/keydb.py

@@ -68,5 +68,6 @@ def keydb_service(
         check=keydb_responsive,
         container_port=6379,
         name=name,
+        transient=xdist_keydb_isolation_level == "server",
     ) as service:
         yield KeydbService(host=service.host, port=service.port, db=db)

src/pytest_databases/docker/mariadb.py

@@ -86,6 +86,7 @@ def check(_service: ServiceContainer) -> bool:
             f"GRANT ALL PRIVILEGES ON {db_name}.* TO '{user}'@'%'; "
             'FLUSH PRIVILEGES;"'
         ),
+        transient=isolation_level == "server",
     ) as service:
         yield MariaDBService(
             db=db_name,

src/pytest_databases/docker/mssql.py

@@ -81,6 +81,7 @@ def check(_service: ServiceContainer) -> bool:
         },
         timeout=100,
         pause=1,
+        transient=xdist_mssql_isolation_level == "server",
     ) as service:
         with pymssql.connect(
             user="sa",

src/pytest_databases/docker/mysql.py

@@ -86,6 +86,7 @@ def check(_service: ServiceContainer) -> bool:
             f"GRANT ALL PRIVILEGES ON {db_name}.* TO '{user}'@'%'; "
             'FLUSH PRIVILEGES;"'
         ),
+        transient=isolation_level == "server",
     ) as service:
         yield MySQLService(
             db=db_name,

src/pytest_databases/docker/postgres.py

@@ -69,6 +69,7 @@ def check(_service: ServiceContainer) -> bool:
             "POSTGRES_PASSWORD": "super-secret",
         },
         exec_after_start=f"psql -U postgres -d postgres -c 'CREATE DATABASE {db_name};'",
+        transient=xdist_postgres_isolate == "server",
     ) as service:
         yield PostgresService(
             database=db_name,

src/pytest_databases/docker/redis.py

@@ -68,5 +68,6 @@ def redis_service(
         check=redis_responsive,
         container_port=6379,
         name=name,
+        transient=xdist_redis_isolation_level == "server",
     ) as service:
         yield RedisService(host=service.host, port=service.port, db=db)

src/pytest_databases/docker/spanner.py

@@ -8,6 +8,7 @@
 from google.auth.credentials import AnonymousCredentials, Credentials
 from google.cloud import spanner
 
+from pytest_databases.helpers import get_xdist_worker_num
 from pytest_databases.types import ServiceContainer
 
 if TYPE_CHECKING:
@@ -36,9 +37,10 @@ def client_options(self) -> ClientOptions:
 def spanner_service(docker_service: DockerService) -> Generator[SpannerService, None, None]:
     with docker_service.run(
         image="gcr.io/cloud-spanner-emulator/emulator:latest",
-        name="spanner",
+        name=f"spanner_{get_xdist_worker_num()}",
         container_port=9010,
         wait_for_log="gRPC server listening at",
+        transient=True,
     ) as service:
         yield SpannerService(
             host=service.host,