Fix test_device_instantiation

Author: rtuck99

src/dodal/utils.py

@@ -240,7 +240,8 @@ def make_device(
 def make_all_devices(
     module: str | ModuleType | None = None, include_skipped: bool = False, **kwargs
 ) -> tuple[dict[str, AnyDevice], dict[str, Exception]]:
-    """Makes all devices in the given beamline module.
+    """Makes all devices in the given beamline module, for those modules using device factories
+    as opposed to the DeviceManager.
 
     In cases of device interdependencies it ensures a device is created before any which
     depend on it.
@@ -413,7 +414,7 @@ def is_v2_device_factory(func: Callable) -> TypeGuard[V2DeviceFactory]:
 
 
 def is_any_device_factory(func: Callable) -> TypeGuard[AnyDeviceFactory]:
-    return isinstance(func, (FunctionType, DeviceInitializationController)) and (
+    return isinstance(func, FunctionType | DeviceInitializationController) and (
         is_v1_device_factory(func) or is_v2_device_factory(func)
     )
 

tests/common/beamlines/test_device_instantiation.py

@@ -4,6 +4,7 @@
 from ophyd_async.core import NotConnectedError
 
 from dodal.beamlines import all_beamline_modules
+from dodal.device_manager import DeviceManager
 from dodal.utils import BLUESKY_PROTOCOLS, make_all_devices
 
 
@@ -44,6 +45,10 @@ def test_devices_are_identical(module_and_devices_for_beamline):
     Ensures that for every beamline all device functions prevent duplicate instantiation.
     """
     bl_mod, devices_a, _ = module_and_devices_for_beamline
+    if isinstance(getattr(bl_mod, "devices", None), DeviceManager):
+        # DeviceManager beamline modules do not cache device instances
+        return
+
     devices_b, _ = make_all_devices(
         bl_mod,
         include_skipped=True,
@@ -55,7 +60,7 @@ def test_devices_are_identical(module_and_devices_for_beamline):
         if device is not devices_b[device_name]
     ]
     total_number_of_devices = len(devices_a)
-    non_identical_number_of_devies = len(devices_a)
+    non_identical_number_of_devices = len(devices_a)
     assert len(non_identical_names) == 0, (
-        f"{non_identical_number_of_devies}/{total_number_of_devices} devices were not identical: {non_identical_names}"
+        f"{non_identical_number_of_devices}/{total_number_of_devices} devices were not identical: {non_identical_names}"
     )

tests/conftest.py

@@ -12,6 +12,7 @@
 from conftest import mock_attributes_table
 from dodal.common.beamlines import beamline_parameters, beamline_utils
 from dodal.common.beamlines.commissioning_mode import set_commissioning_signal
+from dodal.device_manager import DeviceManager
 from dodal.devices.baton import Baton
 from dodal.devices.detector import DetectorParams
 from dodal.devices.detector.det_dim_constants import EIGER2_X_16M_SIZE
@@ -33,11 +34,20 @@ def module_and_devices_for_beamline(request: pytest.FixtureRequest):
     with patch.dict(os.environ, {"BEAMLINE": beamline}, clear=True):
         bl_mod = importlib.import_module("dodal.beamlines." + beamline)
         mock_beamline_module_filepaths(beamline, bl_mod)
-        devices, exceptions = make_all_devices(
-            bl_mod,
-            include_skipped=True,
-            fake_with_ophyd_sim=True,
-        )
+        if isinstance(
+            device_manager := getattr(bl_mod, "devices", None), DeviceManager
+        ):
+            result = device_manager.build_all(include_skipped=True, mock=True).connect()
+            devices, exceptions = (
+                result.devices,
+                result.connection_errors | result.build_errors,
+            )
+        else:
+            devices, exceptions = make_all_devices(
+                bl_mod,
+                include_skipped=True,
+                fake_with_ophyd_sim=True,
+            )
         yield (bl_mod, devices, exceptions)
         beamline_utils.clear_devices()
         for factory in collect_factories(bl_mod).values():