jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-13 00:07:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix invalid configuration of MQTT device QoS option in subentry flow (#147837)

Browse Source
This commit is contained in:
Jan Bouwhuis 2025-07-01 08:46:58 +02:00 committed by GitHub
parent ddf56f053b
commit 4f7348b8bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
homeassistant/components/mqtt/config_flow.py
View File

@ -2771,11 +2771,10 @@ class MQTTSubentryFlowHandler(ConfigSubentryFlow):
reconfig=True, reconfig=True,
) )
if user_input is not None: if user_input is not None:
new_device_data, errors = validate_user_input( new_device_data: dict[str, Any] = user_input.copy()
user_input, MQTT_DEVICE_PLATFORM_FIELDS _, errors = validate_user_input(user_input, MQTT_DEVICE_PLATFORM_FIELDS)
) if "advanced_settings" in new_device_data:
if "mqtt_settings" in user_input: new_device_data |= new_device_data.pop("advanced_settings")
new_device_data["mqtt_settings"] = user_input["mqtt_settings"]
if not errors: if not errors:
self._subentry_data[CONF_DEVICE] = cast(MqttDeviceData, new_device_data) self._subentry_data[CONF_DEVICE] = cast(MqttDeviceData, new_device_data)
if self.source == SOURCE_RECONFIGURE: if self.source == SOURCE_RECONFIGURE:

6
tests/components/mqtt/test_config_flow.py
View File

@ -4077,6 +4077,7 @@ async def test_subentry_reconfigure_update_device_properties(
"model": "Beer bottle XL", "model": "Beer bottle XL",
"model_id": "bn003", "model_id": "bn003",
"configuration_url": "https://example.com", "configuration_url": "https://example.com",
"mqtt_settings": {"qos": 1},
}, },
) )
assert result["type"] is FlowResultType.MENU assert result["type"] is FlowResultType.MENU
@ -4090,12 +4091,15 @@ async def test_subentry_reconfigure_update_device_properties(
assert result["type"] is FlowResultType.ABORT assert result["type"] is FlowResultType.ABORT
assert result["reason"] == "reconfigure_successful" assert result["reason"] == "reconfigure_successful"
# Check our device was updated # Check our device and mqtt data was updated correctly
device = deepcopy(dict(subentry.data))["device"] device = deepcopy(dict(subentry.data))["device"]
assert device["name"] == "Beer notifier" assert device["name"] == "Beer notifier"
assert "hw_version" not in device assert "hw_version" not in device
assert device["model"] == "Beer bottle XL" assert device["model"] == "Beer bottle XL"
assert device["model_id"] == "bn003" assert device["model_id"] == "bn003"
assert device["sw_version"] == "1.1"
assert device["mqtt_settings"]["qos"] == 1
assert "qos" not in device
@pytest.mark.parametrize( @pytest.mark.parametrize(