isolation level

Author: provinzkraut

src/pytest_databases/docker/mariadb.py

@@ -8,14 +8,19 @@
 import pytest
 
 from pytest_databases.helpers import get_xdist_worker_num
-from pytest_databases.types import ServiceContainer
+from pytest_databases.types import ServiceContainer, XdistIsolationLevel
 
 if TYPE_CHECKING:
     from collections.abc import Generator
 
     from pytest_databases._service import DockerService
 
 
+@pytest.fixture(scope="session")
+def xdist_mariadb_isolate() -> XdistIsolationLevel:
+    return "database"
+
+
 @dataclass
 class MariaDBService(ServiceContainer):
     db: str
@@ -28,6 +33,7 @@ def _provide_mysql_service(
     docker_service: DockerService,
     image: str,
     name: str,
+    isolation_level: XdistIsolationLevel,
 ) -> Generator[MariaDBService, None, None]:
     user = "app"
     password = "super-secret"
@@ -57,11 +63,14 @@ def check(_service: ServiceContainer) -> bool:
 
     worker_num = get_xdist_worker_num()
     db_name = f"pytest_{worker_num + 1}"
+    if isolation_level == "server":
+        name = f"{name}_{worker_num}"
+
     with docker_service.run(
         image=image,
         check=check,
         container_port=3306,
-        name=f"{name}_{worker_num}",
+        name=name,
         env={
             "MARIADB_ROOT_PASSWORD": root_password,
             "MARIADB_PASSWORD": password,
@@ -90,11 +99,13 @@ def check(_service: ServiceContainer) -> bool:
 @pytest.fixture(autouse=False, scope="session")
 def mariadb113_service(
     docker_service: DockerService,
+    xdist_mariadb_isolate: 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,
     ) as service:
         yield service
 

src/pytest_databases/docker/mysql.py

@@ -9,11 +9,17 @@
 
 from pytest_databases._service import DockerService, ServiceContainer
 from pytest_databases.helpers import get_xdist_worker_num
+from pytest_databases.types import XdistIsolationLevel
 
 if TYPE_CHECKING:
     from collections.abc import Generator
 
 
+@pytest.fixture(scope="session")
+def xdist_mysql_isolate() -> XdistIsolationLevel:
+    return "database"
+
+
 @dataclass
 class MySQLService(ServiceContainer):
     db: str
@@ -26,6 +32,7 @@ def _provide_mysql_service(
     docker_service: DockerService,
     image: str,
     name: str,
+    isolation_level: XdistIsolationLevel,
 ) -> Generator[MySQLService, None, None]:
     user = "app"
     password = "super-secret"
@@ -55,11 +62,14 @@ def check(_service: ServiceContainer) -> bool:
 
     worker_num = get_xdist_worker_num()
     db_name = f"pytest_{worker_num + 1}"
+    if isolation_level == "server":
+        name = f"{name}_{worker_num}"
+
     with docker_service.run(
         image=image,
         check=check,
         container_port=3306,
-        name=f"{name}_{worker_num}",
+        name=name,
         env={
             "MYSQL_ROOT_PASSWORD": root_password,
             "MYSQL_PASSWORD": password,
@@ -93,35 +103,41 @@ def mysql_service(mysql8_service: MySQLService) -> MySQLService:
 @pytest.fixture(autouse=False, scope="session")
 def mysql8_service(
     docker_service: DockerService,
+    xdist_mysql_isolate: XdistIsolationLevel,
 ) -> Generator[MySQLService, None, None]:
     with _provide_mysql_service(
         image="mysql:8",
         name="mysql-8",
         docker_service=docker_service,
+        isolation_level=xdist_mysql_isolate,
     ) as service:
         yield service
 
 
 @pytest.fixture(autouse=False, scope="session")
 def mysql57_service(
     docker_service: DockerService,
+    xdist_mysql_isolate: 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,
     ) as service:
         yield service
 
 
 @pytest.fixture(autouse=False, scope="session")
 def mysql56_service(
     docker_service: DockerService,
+    xdist_mysql_isolate: 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,
     ) as service:
         yield service