fix: test cleanup

Author: cofin

src/pytest_databases/docker/mariadb.py

@@ -128,8 +128,8 @@ async def mariadb113_service(
 @pytest.fixture()
 async def mariadb_service(
     docker_services: DockerServiceRegistry,
-    docker_compose_files: list[Path],
     default_mariadb_service_name: str,
+    docker_compose_files: list[Path],
     mariadb_port: int,
     mariadb_database: str,
     mariadb_user: str,

src/pytest_databases/docker/mssql.py

@@ -88,7 +88,6 @@ def default_mssql_service_name() -> str:
 @pytest.fixture(autouse=False)
 async def mssql2022_service(
     docker_services: DockerServiceRegistry,
-    default_mssql_service_name: str,
     docker_compose_files: list[Path],
     docker_ip: str,
     mssql2022_port: int,
@@ -117,7 +116,6 @@ async def mssql_service(
     default_mssql_service_name: str,
     docker_compose_files: list[Path],
     docker_ip: str,
-    mssql_default_version: str,
     mssql_port: int,
     mssql_database: str,
     mssql_user: str,
@@ -127,7 +125,7 @@ async def mssql_service(
     os.environ["MSSQL_PASSWORD"] = mssql_password
     os.environ["MSSQL_USER"] = mssql_user
     os.environ["MSSQL_DATABASE"] = mssql_database
-    os.environ[f"{mssql_default_version.upper()}_PORT"] = str(mssql_port)
+    os.environ[f"{default_mssql_service_name.upper()}_PORT"] = str(mssql_port)
     await docker_services.start(
         name=default_mssql_service_name,
         docker_compose_files=docker_compose_files,

src/pytest_databases/docker/mysql.py

@@ -196,7 +196,6 @@ async def mysql_service(
     docker_services: DockerServiceRegistry,
     default_mysql_service_name: str,
     docker_compose_files: list[Path],
-    mysql_default_version: str,
     mysql_port: int,
     mysql_database: str,
     mysql_user: str,
@@ -207,7 +206,7 @@ async def mysql_service(
     os.environ["MYSQL_PASSWORD"] = mysql_password
     os.environ["MYSQL_USER"] = mysql_user
     os.environ["MYSQL_DATABASE"] = mysql_database
-    os.environ[f"{mysql_default_version.upper()}_PORT"] = str(mysql_port)
+    os.environ[f"{default_mysql_service_name.upper()}_PORT"] = str(mysql_port)
     await docker_services.start(
         name=default_mysql_service_name,
         docker_compose_files=docker_compose_files,

src/pytest_databases/docker/oracle.py

@@ -168,7 +168,6 @@ async def oracle_service(
     docker_services: DockerServiceRegistry,
     default_oracle_service_name: str,
     docker_compose_files: list[Path],
-    oracle_default_version: str,
     oracle_port: int,
     oracle_service_name: str,
     oracle_system_password: str,
@@ -179,7 +178,7 @@ async def oracle_service(
     os.environ["ORACLE_SYSTEM_PASSWORD"] = oracle_system_password
     os.environ["ORACLE_USER"] = oracle_user
     os.environ["ORACLE_SERVICE_NAME"] = oracle_service_name
-    os.environ[f"{oracle_default_version.upper()}_PORT"] = str(oracle_port)
+    os.environ[f"{default_oracle_service_name.upper()}_PORT"] = str(oracle_port)
     await docker_services.start(
         name=default_oracle_service_name,
         docker_compose_files=docker_compose_files,

tests/docker/test_mssql.py

@@ -59,13 +59,13 @@
 
 
 async def test_mssql_default_config(
-    mssql_default_version: str,
+    default_mssql_service_name: str,
     mssql_port: int,
     mssql_database: str,
     mssql_user: str,
     mssql_password: str,
 ) -> None:
-    assert mssql_default_version == "mssql2022"
+    assert default_mssql_service_name == "mssql2022"
     assert mssql_port == 4133
     assert mssql_database == "master"
     assert mssql_user == "sa"

tests/docker/test_mysql.py

@@ -38,13 +38,13 @@
 
 
 async def test_mysql_default_config(
-    mysql_default_version: str,
+    default_mysql_service_name: str,
     mysql_port: int,
     mysql_database: str,
     mysql_user: str,
     mysql_password: str,
 ) -> None:
-    assert mysql_default_version == "mysql8"
+    assert default_mysql_service_name == "mysql8"
     assert mysql_port == 3360
     assert mysql_database == "db"
     assert mysql_user == "app"

tests/docker/test_oracle.py

@@ -61,9 +61,9 @@ def test_oracle_default_config(
     oracle_service_name: str,
     oracle_port: int,
     oracle23c_port: int,
-    oracle_default_version: str,
+    default_oracle_service_name: str,
 ) -> None:
-    assert oracle_default_version == "oracle23c"
+    assert default_oracle_service_name == "oracle23c"
     assert oracle_user == "app"
     assert oracle_password == "super-secret"
     assert oracle_service_name == "FREEPDB1"