Fix system tests so that device factories are reset after each test

DiamondLightSource · Feb 4, 2025 · b49e654 · b49e654
1 parent be6374d
commit b49e654
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1509,3 +1509,10 @@ def mock_ispyb_conn_multiscan(base_ispyb_conn):
         list(range(12, 24)),
         list(range(56, 68)),
     )
+
+
+@pytest.fixture(scope="function", autouse=True)
+def clear_device_factory_caches_after_every_test(active_device_factories):
+    yield None
+    for f in active_device_factories:
+        f.cache_clear()  # type: ignore
diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py
@@ -52,10 +52,3 @@ def device_factories_for_beamline(beamline_module: ModuleType) -> set[AnyDeviceF
         for f in collect_factories(beamline_module, include_skipped=True).values()
         if hasattr(f, "cache_clear")
     }
-
-
-@pytest.fixture(scope="function", autouse=True)
-def clear_device_factory_caches_after_every_test(active_device_factories):
-    yield None
-    for f in active_device_factories:
-        f.cache_clear()  # type: ignore