Refactor tests to use per-test imports

tests/db/conftest.py

@@ -0,0 +1,18 @@
+import importlib
+import sys
+from collections.abc import Generator
+
+import pytest
+
+
+@pytest.fixture(autouse=True, scope="function")
+def import_deps() -> Generator:
+    _ = importlib.import_module("lsst.cmservice.handlers.interface")
+    _ = importlib.import_module("lsst.cmservice.handlers.jobs")
+    _ = importlib.import_module("lsst.cmservice.handlers.functions")
+    _ = importlib.import_module("lsst.cmservice.handlers.script_handler")
+    yield
+    del sys.modules["lsst.cmservice.handlers.interface"]
+    del sys.modules["lsst.cmservice.handlers.jobs"]
+    del sys.modules["lsst.cmservice.handlers.functions"]
+    del sys.modules["lsst.cmservice.handlers.script_handler"]

tests/db/test_daemon.py

@@ -1,4 +1,5 @@
 import os
+import uuid
 from asyncio import sleep
 from datetime import datetime
 
@@ -16,7 +17,6 @@
 
 
 @pytest.mark.asyncio()
-@pytest.mark.skip(reason="Test passes when called directly, fails in general run.")
 async def test_daemon_db(engine: AsyncEngine) -> None:
     """Test creating a job, add it to the work queue, and start processing."""
 
@@ -29,7 +29,7 @@ async def test_daemon_db(engine: AsyncEngine) -> None:
         campaign = await interface.load_and_create_campaign(
             session,
             "tests/fixtures/seeds/example_trivial.yaml",
-            "trivial_panda",
+            f"trivial_panda_{uuid.uuid1().int}",
             "test_daemon",
             "trivial_panda#campaign",
         )

tests/db/test_handlers.py

@@ -1,4 +1,6 @@
+import importlib
 import os
+import sys
 from pathlib import Path
 from typing import Any
 
@@ -10,7 +12,6 @@
 
 from lsst.cmservice import db
 from lsst.cmservice.common.enums import LevelEnum, StatusEnum
-from lsst.cmservice.handlers import interface, jobs
 
 from .util_functions import cleanup, create_tree
 
@@ -23,6 +24,7 @@ async def check_run_script(
     spec_block_name: str,
     **kwargs: Any,
 ) -> db.Script:
+    interface = sys.modules["lsst.cmservice.handlers"].interface
     script = await db.Script.create_row(
         session,
         parent_name=parent.fullname,
@@ -51,6 +53,7 @@ async def check_script(
     spec_block_name: str,
     **kwargs: Any,
 ) -> db.Script:
+    interface = sys.modules["lsst.cmservice.handlers"].interface
     script = await db.Script.create_row(
         session,
         parent_name=parent.fullname,
@@ -90,6 +93,7 @@ async def check_script(
 async def test_handlers_campaign_level_db(
     engine: AsyncEngine,
     tmp_path: Path,
+    import_deps: Any,
 ) -> None:
     """Test to run the write and purge methods of various scripts"""
     temp_dir = str(tmp_path / "archive")
@@ -171,6 +175,7 @@ async def test_handlers_campaign_level_db(
 async def test_handlers_step_level_db(
     engine: AsyncEngine,
     tmp_path: Path,
+    import_deps: Any,
     monkeypatch: MonkeyPatch,
 ) -> None:
     """Test to run the write and purge methods of various scripts"""
@@ -211,6 +216,7 @@ async def test_handlers_step_level_db(
 async def test_handlers_group_level_db(
     engine: AsyncEngine,
     tmp_path: Path,
+    import_deps: Any,
     monkeypatch: MonkeyPatch,
 ) -> None:
     """Test to run the write and purge methods of various scripts"""
@@ -268,6 +274,8 @@ async def test_handlers_job_level_db(
     tmp_path: Path,
 ) -> None:
     """Test to run the write and purge methods of various scripts"""
+    interface = importlib.import_module("lsst.cmservice.handlers.interface")
+    jobs = importlib.import_module("lsst.cmservice.handlers.jobs")
     temp_dir = str(tmp_path / "archive")
 
     logger = structlog.get_logger(__name__)
@@ -363,7 +371,7 @@ async def test_handlers_job_level_db(
         )
         assert status == StatusEnum.waiting
 
-        assert jobs.PandaScriptHandler.get_job_id({"Run Id": 322}) == 322  # type: ignore
+        assert jobs.PandaScriptHandler.get_job_id({"Run Id": 322}) == 322
         assert jobs.HTCondorScriptHandler.get_job_id({"Submit dir": "dummy"}) == "dummy"
 
         await cleanup(session, check_cascade=True)

tests/db/test_job.py

@@ -1,3 +1,4 @@
+import importlib
 import os
 import uuid
 
@@ -10,7 +11,6 @@
 from lsst.cmservice import db
 from lsst.cmservice.common import errors
 from lsst.cmservice.common.enums import LevelEnum, StatusEnum
-from lsst.cmservice.handlers import interface
 
 from .util_functions import (
     check_get_methods,
@@ -25,7 +25,7 @@
 @pytest.mark.asyncio()
 async def test_job_db(engine: AsyncEngine) -> None:
     """Test `job` db table."""
-
+    interface = importlib.import_module("lsst.cmservice.handlers.interface")
     # generate a uuid to avoid collisions
     uuid_int = uuid.uuid1().int
     logger = structlog.get_logger(__name__)

tests/db/test_micro.py

@@ -1,3 +1,4 @@
+import importlib
 import os
 from pathlib import Path
 
@@ -9,8 +10,6 @@
 
 from lsst.cmservice.common import errors
 from lsst.cmservice.common.enums import ScriptMethodEnum, StatusEnum
-from lsst.cmservice.handlers import interface
-from lsst.cmservice.handlers.script_handler import ScriptHandler
 
 from .util_functions import cleanup
 
@@ -26,6 +25,8 @@ async def test_micro_db(
     monkeypatch: MonkeyPatch,
 ) -> None:
     """Test fake end to end run using example/example_micro.yaml"""
+    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)
 
     orig_method = ScriptHandler.default_method

tests/db/test_pipetask_error_type.py

@@ -1,3 +1,4 @@
+import importlib
 import os
 
 import pytest
@@ -7,7 +8,6 @@
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 from lsst.cmservice import db
-from lsst.cmservice.handlers import functions, interface
 
 from .util_functions import cleanup, delete_all_rows
 
@@ -20,6 +20,8 @@ async def test_error_match_db(engine: AsyncEngine) -> None:
     fake error which is not in the database.
     """
 
+    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)
@@ -111,6 +113,7 @@ async def test_error_match_db(engine: AsyncEngine) -> None:
 async def test_error_type_db(engine: AsyncEngine) -> None:
     """Test `error_type` db table."""
 
+    interface = importlib.import_module("lsst.cmservice.handlers.interface")
     logger = structlog.get_logger(__name__)
     async with engine.begin():
         session = await create_async_session(engine, logger)

tests/db/test_reports.py

@@ -1,3 +1,4 @@
+import importlib
 import os
 import uuid
 
@@ -8,7 +9,6 @@
 
 from lsst.cmservice import db
 from lsst.cmservice.common.enums import LevelEnum, StatusEnum
-from lsst.cmservice.handlers import functions, interface
 
 from .util_functions import (
     cleanup,
@@ -19,6 +19,8 @@
 @pytest.mark.asyncio()
 async def test_reports_db(engine: AsyncEngine) -> None:
     """Test `job` db table."""
+    interface = importlib.import_module("lsst.cmservice.handlers.interface")
+    functions = importlib.import_module("lsst.cmservice.handlers.functions")
 
     # generate a uuid to avoid collisions
     uuid_int = uuid.uuid1().int

tests/db/util_functions.py

@@ -1,3 +1,4 @@
+import importlib
 from typing import TypeAlias
 
 import pytest
@@ -6,7 +7,6 @@
 from lsst.cmservice import db
 from lsst.cmservice.common import errors
 from lsst.cmservice.common.enums import LevelEnum, StatusEnum, TableEnum
-from lsst.cmservice.handlers import interface
 
 
 async def add_scripts(
@@ -43,6 +43,7 @@ async def create_tree(
     level: LevelEnum,
     uuid_int: int,
 ) -> None:
+    interface = importlib.import_module("lsst.cmservice.handlers.interface")
     specification = await interface.load_specification(session, "examples/empty_config.yaml")
     _ = await specification.get_block(session, "campaign")
 
@@ -107,7 +108,7 @@ async def create_tree(
     if level.value <= LevelEnum.group.value:
         return
 
-    jobs = [
+    jobs_ = [
         await db.Job.create_row(
             session,
             name=f"job_{uuid_int}",
@@ -117,8 +118,8 @@ async def create_tree(
         for group_ in groups
     ]
 
-    for job_ in jobs:
-        await add_scripts(session, job_)
+    for job in jobs_:
+        await add_scripts(session, job)
 
     return
 
@@ -291,6 +292,7 @@ async def check_scripts(
     session: async_scoped_session,
     entry: db.ElementMixin,
 ) -> None:
+    interface = importlib.import_module("lsst.cmservice.handlers.interface")
     scripts = await entry.get_scripts(session)
     assert len(scripts) == 2, f"Expected exactly two scripts for {entry.fullname} got {len(scripts)}"
 
@@ -376,6 +378,7 @@ async def check_get_methods(
     entry_class: TypeAlias = db.ElementMixin,
     parent_class: TypeAlias = db.ElementMixin,
 ) -> None:
+    interface = importlib.import_module("lsst.cmservice.handlers.interface")
     check_getall_nonefound = await entry_class.get_rows(
         session,
         parent_name="bad",