Minor changes from PR comments

Rename ensure_connected to check_connected

Author: rtuck99

helm/blueapi/config_schema.json

@@ -92,10 +92,10 @@
                     "title": "Name",
                     "type": "string"
                 },
-                "ensure_connected": {
+                "check_connected": {
                     "default": false,
                     "description": "If true, all devices must be successfully connected at startup.",
-                    "title": "Ensure Connected",
+                    "title": "Check Connected",
                     "type": "boolean"
                 }
             },

helm/blueapi/values.schema.json

@@ -510,8 +510,8 @@
                 "module"
             ],
             "properties": {
-                "ensure_connected": {
-                    "title": "Ensure Connected",
+                "check_connected": {
+                    "title": "Check Connected",
                     "description": "If true, all devices must be successfully connected at startup.",
                     "default": false,
                     "type": "boolean"

src/blueapi/config.py

@@ -83,7 +83,7 @@ class DeviceManagerSource(Source):
     name: str = Field(
         default="devices", description="Name of the device manager in the module"
     )
-    ensure_connected: bool = Field(
+    check_connected: bool = Field(
         default=False,
         description="If true, all devices must be successfully connected at startup.",
     )

src/blueapi/core/context.py

@@ -215,19 +215,18 @@ def with_config(self, config: EnvironmentConfig) -> None:
                 case DodalSource(mock=mock):
                     self.with_dodal_module(mod, mock=mock)
                 case DeviceManagerSource(
-                    mock=mock, name=name, ensure_connected=ensure_connected
+                    mock=mock, name=name, check_connected=check_connected
                 ):
                     manager = getattr(mod, name)
                     if not isinstance(manager, DeviceManager):
                         raise ValueError(
                             f"{name} in module {mod} is not a device manager"
                         )
-                    device_map, error_map = self.with_device_manager(manager, mock)
-                    if ensure_connected and error_map:
-                        raise ExceptionGroup(
-                            "Errors occurred while connecting the following devices: "
-                            f"{', '.join(error_map.keys())}",
-                            list(error_map.values()),
+                    _, error_map = self.with_device_manager(manager, mock)
+                    if check_connected and error_map:
+                        raise RuntimeError(
+                            "Errors occurred while building/connecting the following "
+                            f"devices: {', '.join(error_map)}",
                         )
 
     def with_plan_module(self, module: ModuleType) -> None:

tests/unit_tests/core/test_context.py

@@ -443,16 +443,15 @@ def test_with_config_passes_mock_to_with_dodal_module(
 def test_with_config_raises_exception_group_on_connection_errors_when_ensure_connected(
     empty_context: BlueskyContext, beamline_with_connection_and_build_errors: None
 ):
-    with pytest.raises(ExceptionGroup, match="Errors occurred while connecting.*") as e:
+    with pytest.raises(
+        RuntimeError, match="Errors occurred while building/connecting.*"
+    ):
         empty_context.with_config(
             EnvironmentConfig(
-                sources=[DeviceManagerSource(module="foo.bar", ensure_connected=True)]
+                sources=[DeviceManagerSource(module="foo.bar", check_connected=True)]
             )
         )
 
-    assert e.value.exceptions[0].args[0] == "Simulated Build Error"
-    assert e.value.exceptions[1].args[0] == "Simulated Connection Error"
-
 
 def test_with_config_ignores_build_connect_exceptions_by_default(
     empty_context: BlueskyContext, beamline_with_connection_and_build_errors: None