Simplify some fixtures

Author: dolfinus

tests/conftest.py

@@ -3,6 +3,7 @@
 import os
 import time
 from collections.abc import AsyncGenerator, Callable
+from contextlib import suppress
 from pathlib import Path
 from unittest.mock import AsyncMock, Mock
 
@@ -104,10 +105,9 @@ def alembic_config(settings: Settings) -> AlembicConfig:
 @pytest_asyncio.fixture(scope="session")
 async def async_engine(settings: Settings, alembic_config: AlembicConfig):
     await prepare_new_database(settings=settings)
-    try:
+    with suppress(Exception):
         await run_async_migrations(alembic_config, Base.metadata, "-1", "down")
-    except Exception:
-        pass
+
     await run_async_migrations(alembic_config, Base.metadata, "head")
     engine = create_async_engine(settings.database.url)
     yield engine

tests/test_integration/test_run_transfer/connection_fixtures/file_storage_fixtures.py

@@ -2,7 +2,6 @@
 
 import pytest
 from onetl.file.format import CSV, JSON, ORC, XML, Excel, JSONLine, Parquet
-from pytest import FixtureRequest
 
 
 @pytest.fixture(scope="session")
@@ -13,99 +12,45 @@ def resource_path():
 
 
 @pytest.fixture(params=[""])
-def file_format_flavor(request: FixtureRequest):
+def file_format_flavor(request: pytest.FixtureRequest):
     return request.param
 
 
-@pytest.fixture()
-def source_file_format(request: FixtureRequest):
+@pytest.fixture
+def source_file_format(request: pytest.FixtureRequest):
     name, params = request.param
-    if name == "csv":
-        return "csv", CSV(
-            lineSep="\n",
-            header=True,
-            **params,
-        )
-
-    if name == "jsonline":
-        return "jsonline", JSONLine(
-            encoding="utf-8",
-            lineSep="\n",
-            **params,
-        )
-
-    if name == "json":
-        return "json", JSON(
-            lineSep="\n",
-            encoding="utf-8",
-            **params,
-        )
-
-    if name == "excel":
-        return "excel", Excel(
-            header=True,
-            inferSchema=True,
-            **params,
-        )
-
-    if name == "orc":
-        return "orc", ORC(
-            **params,
-        )
-
-    if name == "parquet":
-        return "parquet", Parquet(
-            **params,
-        )
-
-    if name == "xml":
-        return "xml", XML(
-            row_tag="item",
-            **params,
-        )
-
-    raise ValueError(f"Unsupported file format: {name}")
-
-
-@pytest.fixture()
-def target_file_format(request: FixtureRequest):
+    result_map = {
+        "csv": CSV(lineSep="\n", header=True, **params),
+        "jsonline": JSONLine(encoding="utf-8", lineSep="\n", **params),
+        "json": JSON(lineSep="\n", encoding="utf-8", **params),
+        "excel": Excel(header=True, inferSchema=True, **params),
+        "orc": ORC(**params),
+        "parquet": Parquet(**params),
+        "xml": XML(rowTag="item", **params),
+    }
+
+    try:
+        return name, result_map[name]
+    except KeyError as e:
+        msg = f"Unsupported file format: {name}"
+        raise ValueError(msg) from e
+
+
+@pytest.fixture
+def target_file_format(request: pytest.FixtureRequest):
     name, params = request.param
-    if name == "csv":
-        return "csv", CSV(
-            lineSep="\n",
-            header=True,
-            timestampFormat="yyyy-MM-dd'T'HH:mm:ss.SSSSSS+00:00",
-            **params,
-        )
-
-    if name == "jsonline":
-        return "jsonline", JSONLine(
-            encoding="utf-8",
-            lineSep="\n",
-            timestampFormat="yyyy-MM-dd'T'HH:mm:ss.SSSSSS+00:00",
-            **params,
-        )
-
-    if name == "excel":
-        return "excel", Excel(
-            header=False,
-            **params,
-        )
-
-    if name == "orc":
-        return "orc", ORC(
-            **params,
-        )
-
-    if name == "parquet":
-        return "parquet", Parquet(
-            **params,
-        )
-
-    if name == "xml":
-        return "xml", XML(
-            row_tag="item",
-            **params,
-        )
-
-    raise ValueError(f"Unsupported file format: {name}")
+    timestamp_format = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS+00:00"
+    result_map = {
+        "csv": CSV(lineSep="\n", header=True, timestampFormat=timestamp_format, **params),
+        "jsonline": JSONLine(encoding="utf-8", lineSep="\n", timestampFormat=timestamp_format, **params),
+        "excel": Excel(header=True, inferSchema=True, **params),
+        "orc": ORC(**params),
+        "parquet": Parquet(**params),
+        "xml": XML(rowTag="item", **params),
+    }
+
+    try:
+        return name, result_map[name]
+    except KeyError as e:
+        msg = f"Unsupported file format: {name}"
+        raise ValueError(msg) from e