Fix display tests

Author: C-Achard

dlclivegui/services/multi_camera_controller.py

@@ -150,6 +150,10 @@ def stop(self) -> None:
         self._stop_event.set()
 
 
+def get_display_id(settings: CameraSettings) -> str:
+    return f"{settings.backend}:{settings.index}"
+
+
 def get_camera_id(settings: CameraSettings) -> str:
     """Generate a unique camera ID from stable backend identity."""
     backend = (settings.backend or "").lower()
@@ -303,7 +307,7 @@ def start(self, camera_settings: list[CameraSettings]) -> None:
     def _start_camera(self, settings: CameraSettings) -> None:
         """Start a single camera."""
         settings_copy = copy.deepcopy(settings)
-        cam_id = get_camera_id(settings_copy)
+        cam_id = get_display_id(settings_copy)
         if cam_id in self._workers:
             LOGGER.warning(f"Camera {cam_id} already has a worker")
             return

tests/services/test_multicam_controller.py

@@ -10,6 +10,7 @@
     _camera_start_priority,
     _trigger_role_from_settings,
     get_camera_id,
+    get_display_id,
 )
 
 
@@ -65,7 +66,7 @@ def test_rotation_and_crop(qtbot, patch_factory):
     last_shape = {"shape": None}
 
     def on_ready(mfd):
-        f = mfd.frames.get(get_camera_id(cam))
+        f = mfd.frames.get(get_display_id(cam))
         if f is not None:
             last_shape["shape"] = f.shape
 
@@ -255,7 +256,7 @@ def test_frame_ready_emits_frames_in_user_configured_order(qtbot, patch_factory)
         properties={"opencv": {"device_id": "cam-b"}},
     ).apply_defaults()
 
-    expected_order = [get_camera_id(cam_a), get_camera_id(cam_b)]
+    expected_order = [get_display_id(cam_a), get_display_id(cam_b)]
     seen_orders: list[list[str]] = []
 
     def on_ready(mfd):
@@ -387,7 +388,7 @@ def _create(settings):
         mc.start([cam])
 
     cam_id, msg = blocker.args
-    assert cam_id == get_camera_id(cam)
+    assert cam_id == get_display_id(cam)
     assert "Camera read timeout" in msg
 
     # Cleanup if still running.