some cleanup

Author: provinzkraut

src/pytest_databases/docker/cockroachdb.py

@@ -16,7 +16,7 @@
 
 
 @pytest.fixture(scope="session")
-def xdist_cockroachdb_isolate() -> XdistIsolationLevel:
+def cockroachdb_xdist_isolation_level() -> XdistIsolationLevel:
     return "database"
 
 
@@ -34,7 +34,7 @@ def cockroachdb_driver_opts() -> dict[str, str]:
 @pytest.fixture(autouse=False, scope="session")
 def cockroachdb_service(
     docker_service: DockerService,
-    xdist_cockroachdb_isolate: XdistIsolationLevel,
+    cockroachdb_xdist_isolation_level: XdistIsolationLevel,
     cockroachdb_driver_opts: dict[str, str],
 ) -> Generator[CockroachDBService, None, None]:
     def cockroachdb_responsive(_service: ServiceContainer) -> bool:
@@ -53,7 +53,7 @@ def cockroachdb_responsive(_service: ServiceContainer) -> bool:
     container_name = "cockroachdb"
 
     worker_num = get_xdist_worker_num()
-    if xdist_cockroachdb_isolate == "server":
+    if cockroachdb_xdist_isolation_level == "server":
         container_name = f"container_name_{worker_num}"
 
     db_name = f"pytest_{worker_num + 1}"

src/pytest_databases/docker/dragonfly.py

@@ -15,7 +15,7 @@
 
 
 @pytest.fixture(scope="session")
-def xdist_dragonfly_isolate() -> XdistIsolationLevel:
+def xdist_dragonfly_isolation_level() -> XdistIsolationLevel:
     return "database"
 
 
@@ -53,10 +53,10 @@ def dragonfly_image() -> str:
 def dragonfly_service(
     docker_service: DockerService,
     dragonfly_image: str,
-    xdist_dragonfly_isolate: XdistIsolationLevel,
+    xdist_dragonfly_isolation_level: XdistIsolationLevel,
 ) -> Generator[DragonflyService, None, None]:
     worker_num = get_xdist_worker_num()
-    if xdist_dragonfly_isolate == "database":
+    if xdist_dragonfly_isolation_level == "database":
         container_num = worker_num // 1
         name = f"dragonfly_{container_num + 1}"
         db = worker_num

src/pytest_databases/docker/keydb.py

@@ -14,11 +14,6 @@
     from pytest_databases._service import DockerService
 
 
-@pytest.fixture(scope="session")
-def xdist_keydb_isolate() -> XdistIsolationLevel:
-    return "database"
-
-
 @dataclasses.dataclass
 class KeydbService(ServiceContainer):
     db: int
@@ -34,6 +29,11 @@ def keydb_responsive(service_container: ServiceContainer) -> bool:
         client.close()
 
 
+@pytest.fixture(scope="session")
+def xdist_keydb_isolation_level() -> XdistIsolationLevel:
+    return "database"
+
+
 @pytest.fixture(scope="session")
 def keydb_port(keydb_service: KeydbService) -> int:
     return keydb_service.port
@@ -52,11 +52,11 @@ def keydb_image() -> str:
 @pytest.fixture(autouse=False, scope="session")
 def keydb_service(
     docker_service: DockerService,
-    xdist_keydb_isolate: XdistIsolationLevel,
+    xdist_keydb_isolation_level: XdistIsolationLevel,
     keydb_image: str,
 ) -> Generator[KeydbService, None, None]:
     worker_num = get_xdist_worker_num()
-    if xdist_keydb_isolate == "database":
+    if xdist_keydb_isolation_level == "database":
         container_num = worker_num // 1
         name = f"keydb_{container_num + 1}"
         db = worker_num

src/pytest_databases/docker/mariadb.py

@@ -16,18 +16,18 @@
     from pytest_databases._service import DockerService
 
 
-@pytest.fixture(scope="session")
-def xdist_mariadb_isolate() -> XdistIsolationLevel:
-    return "database"
-
-
 @dataclass
 class MariaDBService(ServiceContainer):
     db: str
     user: str
     password: str
 
 
+@pytest.fixture(scope="session")
+def xdist_mariadb_isolation_level() -> XdistIsolationLevel:
+    return "database"
+
+
 @contextlib.contextmanager
 def _provide_mysql_service(
     docker_service: DockerService,
@@ -99,13 +99,13 @@ def check(_service: ServiceContainer) -> bool:
 @pytest.fixture(autouse=False, scope="session")
 def mariadb113_service(
     docker_service: DockerService,
-    xdist_mariadb_isolate: XdistIsolationLevel,
+    xdist_mariadb_isolation_level: XdistIsolationLevel,
 ) -> Generator[MariaDBService, None, None]:
     with _provide_mysql_service(
         docker_service=docker_service,
         image="mariadb:11.3",
         name="mariadb-11.3",
-        isolation_level=xdist_mariadb_isolate,
+        isolation_level=xdist_mariadb_isolation_level,
     ) as service:
         yield service
 

src/pytest_databases/docker/mssql.py

@@ -16,7 +16,7 @@
 
 
 @pytest.fixture(scope="session")
-def xdist_mssql_isolate() -> XdistIsolationLevel:
+def xdist_mssql_isolation_level() -> XdistIsolationLevel:
     return "database"
 
 
@@ -42,7 +42,7 @@ def connection_string(self) -> str:
 @pytest.fixture(autouse=False, scope="session")
 def mssql_service(
     docker_service: DockerService,
-    xdist_mssql_isolate: XdistIsolationLevel,
+    xdist_mssql_isolation_level: XdistIsolationLevel,
 ) -> Generator[MSSQLService, None, None]:
     password = "Super-secret1"
 
@@ -65,7 +65,7 @@ def check(_service: ServiceContainer) -> bool:
     worker_num = get_xdist_worker_num()
     db_name = f"pytest_{worker_num + 1}"
     container_name = "mssql"
-    if xdist_mssql_isolate == "server":
+    if xdist_mssql_isolation_level == "server":
         container_name = f"{container_name}_{worker_num}"
 
     with docker_service.run(

src/pytest_databases/docker/mysql.py

@@ -16,18 +16,18 @@
     from pytest_databases.types import XdistIsolationLevel
 
 
-@pytest.fixture(scope="session")
-def xdist_mysql_isolate() -> XdistIsolationLevel:
-    return "database"
-
-
 @dataclass
 class MySQLService(ServiceContainer):
     db: str
     user: str
     password: str
 
 
+@pytest.fixture(scope="session")
+def xdist_mysql_isolation_level() -> XdistIsolationLevel:
+    return "database"
+
+
 @contextlib.contextmanager
 def _provide_mysql_service(
     docker_service: DockerService,
@@ -104,41 +104,41 @@ def mysql_service(mysql8_service: MySQLService) -> MySQLService:
 @pytest.fixture(autouse=False, scope="session")
 def mysql8_service(
     docker_service: DockerService,
-    xdist_mysql_isolate: XdistIsolationLevel,
+    xdist_mysql_isolation_level: XdistIsolationLevel,
 ) -> Generator[MySQLService, None, None]:
     with _provide_mysql_service(
         image="mysql:8",
         name="mysql-8",
         docker_service=docker_service,
-        isolation_level=xdist_mysql_isolate,
+        isolation_level=xdist_mysql_isolation_level,
     ) as service:
         yield service
 
 
 @pytest.fixture(autouse=False, scope="session")
 def mysql57_service(
     docker_service: DockerService,
-    xdist_mysql_isolate: XdistIsolationLevel,
+    xdist_mysql_isolation_level: XdistIsolationLevel,
 ) -> Generator[MySQLService, None, None]:
     with _provide_mysql_service(
         image="mysql:5.7",
         name="mysql-57",
         docker_service=docker_service,
-        isolation_level=xdist_mysql_isolate,
+        isolation_level=xdist_mysql_isolation_level,
     ) as service:
         yield service
 
 
 @pytest.fixture(autouse=False, scope="session")
 def mysql56_service(
     docker_service: DockerService,
-    xdist_mysql_isolate: XdistIsolationLevel,
+    xdist_mysql_isolation_level: XdistIsolationLevel,
 ) -> Generator[MySQLService, None, None]:
     with _provide_mysql_service(
         image="mysql:5.6",
         name="mysql-56",
         docker_service=docker_service,
-        isolation_level=xdist_mysql_isolate,
+        isolation_level=xdist_mysql_isolation_level,
     ) as service:
         yield service
 

src/pytest_databases/docker/postgres.py

@@ -20,18 +20,18 @@ def _make_connection_string(host: str, port: int, user: str, password: str, data
     return f"dbname={database} user={user} host={host} port={port} password={password}"
 
 
+@pytest.fixture(scope="session")
+def xdist_postgres_isolation_level() -> XdistIsolationLevel:
+    return "database"
+
+
 @dataclasses.dataclass
 class PostgresService(ServiceContainer):
     database: str
     password: str
     user: str
 
 
-@pytest.fixture(scope="session")
-def xdist_postgres_isolate() -> XdistIsolationLevel:
-    return "database"
-
-
 @contextmanager
 def _provide_postgres_service(
     docker_service: DockerService,
@@ -82,97 +82,97 @@ def check(_service: ServiceContainer) -> bool:
 @pytest.fixture(autouse=False, scope="session")
 def postgres_11_service(
     docker_service: DockerService,
-    xdist_postgres_isolate: XdistIsolationLevel,
+    xdist_postgres_isolation_level: XdistIsolationLevel,
 ) -> Generator[PostgresService, None, None]:
     with _provide_postgres_service(
         docker_service,
         image="postgres:11",
         name="postgres-11",
-        xdist_postgres_isolate=xdist_postgres_isolate,
+        xdist_postgres_isolate=xdist_postgres_isolation_level,
     ) as service:
         yield service
 
 
 @pytest.fixture(autouse=False, scope="session")
 def postgres_12_service(
     docker_service: DockerService,
-    xdist_postgres_isolate: XdistIsolationLevel,
+    xdist_postgres_isolation_level: XdistIsolationLevel,
 ) -> Generator[PostgresService, None, None]:
     with _provide_postgres_service(
         docker_service,
         image="postgres:12",
         name="postgres-12",
-        xdist_postgres_isolate=xdist_postgres_isolate,
+        xdist_postgres_isolate=xdist_postgres_isolation_level,
     ) as service:
         yield service
 
 
 @pytest.fixture(autouse=False, scope="session")
 def postgres_13_service(
     docker_service: DockerService,
-    xdist_postgres_isolate: XdistIsolationLevel,
+    xdist_postgres_isolation_level: XdistIsolationLevel,
 ) -> Generator[PostgresService, None, None]:
     with _provide_postgres_service(
         docker_service,
         image="postgres:13",
         name="postgres-13",
-        xdist_postgres_isolate=xdist_postgres_isolate,
+        xdist_postgres_isolate=xdist_postgres_isolation_level,
     ) as service:
         yield service
 
 
 @pytest.fixture(autouse=False, scope="session")
 def postgres_14_service(
     docker_service: DockerService,
-    xdist_postgres_isolate: XdistIsolationLevel,
+    xdist_postgres_isolation_level: XdistIsolationLevel,
 ) -> Generator[PostgresService, None, None]:
     with _provide_postgres_service(
         docker_service,
         image="postgres:14",
         name="postgres-14",
-        xdist_postgres_isolate=xdist_postgres_isolate,
+        xdist_postgres_isolate=xdist_postgres_isolation_level,
     ) as service:
         yield service
 
 
 @pytest.fixture(autouse=False, scope="session")
 def postgres_15_service(
     docker_service: DockerService,
-    xdist_postgres_isolate: XdistIsolationLevel,
+    xdist_postgres_isolation_level: XdistIsolationLevel,
 ) -> Generator[PostgresService, None, None]:
     with _provide_postgres_service(
         docker_service,
         image="postgres:15",
         name="postgres-15",
-        xdist_postgres_isolate=xdist_postgres_isolate,
+        xdist_postgres_isolate=xdist_postgres_isolation_level,
     ) as service:
         yield service
 
 
 @pytest.fixture(autouse=False, scope="session")
 def postgres_16_service(
     docker_service: DockerService,
-    xdist_postgres_isolate: XdistIsolationLevel,
+    xdist_postgres_isolation_level: XdistIsolationLevel,
 ) -> Generator[PostgresService, None, None]:
     with _provide_postgres_service(
         docker_service,
         image="postgres:16",
         name="postgres-16",
-        xdist_postgres_isolate=xdist_postgres_isolate,
+        xdist_postgres_isolate=xdist_postgres_isolation_level,
     ) as service:
         yield service
 
 
 @pytest.fixture(autouse=False, scope="session")
 def postgres_17_service(
     docker_service: DockerService,
-    xdist_postgres_isolate: XdistIsolationLevel,
+    xdist_postgres_isolation_level: XdistIsolationLevel,
 ) -> Generator[PostgresService, None, None]:
     with _provide_postgres_service(
         docker_service,
         image="postgres:17",
         name="postgres-17",
-        xdist_postgres_isolate=xdist_postgres_isolate,
+        xdist_postgres_isolate=xdist_postgres_isolation_level,
     ) as service:
         yield service
 

src/pytest_databases/docker/redis.py

@@ -14,16 +14,16 @@
     from pytest_databases._service import DockerService
 
 
-@pytest.fixture(scope="session")
-def xdist_redis_isolate() -> XdistIsolationLevel:
-    return "database"
-
-
 @dataclasses.dataclass
 class RedisService(ServiceContainer):
     db: int
 
 
+@pytest.fixture(scope="session")
+def xdist_redis_isolation_level() -> XdistIsolationLevel:
+    return "database"
+
+
 def redis_responsive(service_container: ServiceContainer) -> bool:
     client = Redis(host=service_container.host, port=service_container.port)
     try:
@@ -53,10 +53,10 @@ def redis_image() -> str:
 def redis_service(
     docker_service: DockerService,
     redis_image: str,
-    xdist_redis_isolate: XdistIsolationLevel,
+    xdist_redis_isolation_level: XdistIsolationLevel,
 ) -> Generator[RedisService, None, None]:
     worker_num = get_xdist_worker_num()
-    if xdist_redis_isolate == "database":
+    if xdist_redis_isolation_level == "database":
         container_num = worker_num // 1
         name = f"redis_{container_num + 1}"
         db = worker_num