Refactor tests to use fixture files

Author: tcjennings

.gitignore

@@ -232,3 +232,6 @@ bruno/
 # Ruff
 # Ruff usually installs a .gitignore file in its directory.
 .ruff_cache/
+
+# Local Allows
+!**/*.log

tests/cli/test_errors.py

@@ -1,3 +1,5 @@
+from pathlib import Path
+
 import pytest
 from click.testing import CliRunner
 from safir.testing.uvicorn import UvicornProcess
@@ -43,17 +45,18 @@ async def test_error_create_cli(uvicorn: UvicornProcess, api_version: str) -> No
 async def test_load_error_types_cli(uvicorn: UvicornProcess, api_version: str) -> None:
     """Test `error_type` db table."""
 
+    fixtures = Path(__file__).parent.parent / "fixtures" / "seeds"
     client_config.service_url = f"{uvicorn.url}{config.asgi.prefix}/{api_version}"
     runner = CliRunner()
 
-    result = runner.invoke(client_top, "load error-types --yaml_file examples/error_types.yaml")
+    result = runner.invoke(client_top, f"load error-types --yaml_file {fixtures}/error_types.yaml")
     assert result.exit_code == 0
 
-    result = runner.invoke(client_top, "load error-types --yaml_file examples/error_types.yaml")
+    result = runner.invoke(client_top, f"load error-types --yaml_file {fixtures}/error_types.yaml")
     assert result.exit_code == 0
 
     result = runner.invoke(
-        client_top, "load error-types --allow_update --yaml_file examples/error_types.yaml"
+        client_top, f"load error-types --allow_update --yaml_file {fixtures}/error_types.yaml"
     )
     assert result.exit_code == 0
 

tests/cli/util_functions.py

@@ -1,3 +1,4 @@
+from pathlib import Path
 from typing import TypeAlias, TypeVar
 
 import yaml
@@ -70,9 +71,10 @@ def create_tree(
     level: LevelEnum,
     uuid_int: int,
 ) -> None:
+    fixtures = Path(__file__).parent.parent / "fixtures" / "seeds"
     result = runner.invoke(
         client_top,
-        "load specification --output yaml --yaml_file examples/empty_config.yaml",
+        f"load specification --output yaml --yaml_file {fixtures}/empty_config.yaml",
     )
     # check_and_parse_result(result, models.Specification)
 

tests/common/test_common.py

@@ -28,6 +28,7 @@
 async def test_common_bash() -> None:
     """Test common.bash utilities"""
 
+    fixtures = Path(__file__).parent.parent / "fixtures" / "logs"
     the_script = await write_bash_script(
         "temp.sh",
         "ls",
@@ -47,10 +48,10 @@ async def test_common_bash() -> None:
     await Path("temp.stamp").unlink(missing_ok=True)
     await Path("temp.log").unlink(missing_ok=True)
 
-    bps_dict = await parse_bps_stdout("examples/bps_stdout.log")
+    bps_dict = await parse_bps_stdout(f"{fixtures}/bps_stdout.log")
     assert bps_dict["run_id"].strip() == "334"
 
-    diag_message = await get_diagnostic_message("examples/bps_stdout.log")
+    diag_message = await get_diagnostic_message(f"{fixtures}/bps_stdout.log")
     assert diag_message == "dummy: ada"
 
 

tests/db/test_campaign.py

@@ -1,5 +1,6 @@
 import os
 import uuid
+from pathlib import Path
 
 import pytest
 import structlog
@@ -26,6 +27,7 @@
 async def test_campaign_db(engine: AsyncEngine) -> None:
     """Test `campaign` db table."""
 
+    fixtures = Path(__file__).parent.parent / "fixtures" / "seeds"
     db.handler.Handler.reset_cache()
 
     # generate a uuid to avoid collisions
@@ -39,7 +41,7 @@ async def test_campaign_db(engine: AsyncEngine) -> None:
         await create_tree(session, LevelEnum.step, uuid_int)
 
         # test the upsert mechanism
-        await interface.load_specification(session, "examples/empty_config.yaml", allow_update=True)
+        await interface.load_specification(session, f"{fixtures}/empty_config.yaml", allow_update=True)
 
         with pytest.raises(IntegrityError):
             await db.Campaign.create_row(

tests/db/test_micro.py

@@ -25,6 +25,7 @@ async def test_micro_db(
     monkeypatch: MonkeyPatch,
 ) -> None:
     """Test fake end to end run using example/example_micro.yaml"""
+    fixtures = Path(__file__).parent.parent / "fixtures" / "seeds"
     ScriptHandler = importlib.import_module("lsst.cmservice.handlers.script_handler").ScriptHandler
     interface = importlib.import_module("lsst.cmservice.handlers.interface")
     monkeypatch.setattr("lsst.cmservice.config.config.butler.mock", True)
@@ -36,7 +37,7 @@ async def test_micro_db(
     async with engine.begin():
         session = await create_async_session(engine, logger)
         os.environ["CM_CONFIGS"] = "examples"
-        specification = await interface.load_specification(session, "examples/empty_config.yaml")
+        specification = await interface.load_specification(session, f"{fixtures}/empty_config.yaml")
         check2 = await specification.get_block(session, "campaign")
         assert check2.name == "campaign"
 

tests/db/test_pipetask_error_type.py

@@ -1,5 +1,6 @@
 import importlib
 import os
+from pathlib import Path
 
 import pytest
 import structlog
@@ -20,13 +21,14 @@ async def test_error_match_db(engine: AsyncEngine) -> None:
     fake error which is not in the database.
     """
 
+    fixtures = Path(__file__).parent.parent / "fixtures" / "seeds"
     interface = importlib.import_module("lsst.cmservice.handlers.interface")
     functions = importlib.import_module("lsst.cmservice.handlers.functions")
     logger = structlog.get_logger(__name__)
     async with engine.begin():
         session = await create_async_session(engine, logger)
         os.environ["CM_CONFIGS"] = "examples"
-        specification = await interface.load_specification(session, "examples/empty_config.yaml")
+        specification = await interface.load_specification(session, f"{fixtures}/empty_config.yaml")
         check2 = await specification.get_block(session, "campaign")
         assert check2.name == "campaign"
 
@@ -113,12 +115,13 @@ async def test_error_match_db(engine: AsyncEngine) -> None:
 async def test_error_type_db(engine: AsyncEngine) -> None:
     """Test `error_type` db table."""
 
+    fixtures = Path(__file__).parent.parent / "fixtures" / "seeds"
     interface = importlib.import_module("lsst.cmservice.handlers.interface")
     logger = structlog.get_logger(__name__)
     async with engine.begin():
         session = await create_async_session(engine, logger)
         os.environ["CM_CONFIGS"] = "examples"
-        specification = await interface.load_specification(session, "examples/empty_config.yaml")
+        specification = await interface.load_specification(session, f"{fixtures}/empty_config.yaml")
         check2 = await specification.get_block(session, "campaign")
         assert check2.name == "campaign"
 

tests/db/test_reports.py

@@ -1,6 +1,7 @@
 import importlib
 import os
 import uuid
+from pathlib import Path
 
 import pytest
 import structlog
@@ -19,6 +20,7 @@
 @pytest.mark.asyncio()
 async def test_reports_db(engine: AsyncEngine) -> None:
     """Test `job` db table."""
+    fixtures = Path(__file__).parent.parent / "fixtures" / "seeds"
     interface = importlib.import_module("lsst.cmservice.handlers.interface")
     functions = importlib.import_module("lsst.cmservice.handlers.functions")
 
@@ -46,7 +48,7 @@ async def test_reports_db(engine: AsyncEngine) -> None:
 
         await interface.load_error_types(
             session,
-            "examples/error_types.yaml",
+            f"{fixtures}/error_types.yaml",
         )
 
         status_check = await functions.compute_job_status(

tests/db/util_functions.py

@@ -1,4 +1,5 @@
 import importlib
+from pathlib import Path
 from typing import TypeAlias
 
 import pytest
@@ -43,8 +44,9 @@ async def create_tree(
     level: LevelEnum,
     uuid_int: int,
 ) -> None:
+    fixtures = Path(__file__).parent.parent / "fixtures" / "seeds"
     interface = importlib.import_module("lsst.cmservice.handlers.interface")
-    specification = await interface.load_specification(session, "examples/empty_config.yaml")
+    specification = await interface.load_specification(session, f"{fixtures}/empty_config.yaml")
     _ = await specification.get_block(session, "campaign")
 
     pname = f"prod0_{uuid_int}"