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

Fix Z-Wave migration flow to unload config entry before unplugging controller (#144343)

Browse Source 
* Fix Z-Wave migration unload config entry before unplugging controller

* Remove typo
This commit is contained in:
Martin Hjelmare 2025-05-06 16:57:11 +02:00 committed by GitHub
parent 253217958b
commit c3ce82d874
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -907,10 +907,6 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
"""Reset the current controller, and instruct the user to unplug it.""" """Reset the current controller, and instruct the user to unplug it."""
if user_input is not None: if user_input is not None:
config_entry = self._reconfigure_config_entry
assert config_entry is not None
# Unload the config entry before stopping the add-on.
await self.hass.config_entries.async_unload(config_entry.entry_id)
if self.usb_path: if self.usb_path:
# USB discovery was used, so the device is already known. # USB discovery was used, so the device is already known.
await self._async_set_addon_config({CONF_ADDON_DEVICE: self.usb_path}) await self._async_set_addon_config({CONF_ADDON_DEVICE: self.usb_path})
@ -925,6 +921,11 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
_LOGGER.error("Failed to reset controller: %s", err) _LOGGER.error("Failed to reset controller: %s", err)
return self.async_abort(reason="reset_failed") return self.async_abort(reason="reset_failed")
config_entry = self._reconfigure_config_entry
assert config_entry is not None
# Unload the config entry before asking the user to unplug the controller.
await self.hass.config_entries.async_unload(config_entry.entry_id)
return self.async_show_form( return self.async_show_form(
step_id="instruct_unplug", step_id="instruct_unplug",
description_placeholders={ description_placeholders={

9
tests/components/zwave_js/test_config_flow.py
View File

@ -1109,10 +1109,10 @@ async def test_usb_discovery_migration_driver_ready_timeout(
assert result["type"] == FlowResultType.FORM assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "instruct_unplug" assert result["step_id"] == "instruct_unplug"
assert entry.state is config_entries.ConfigEntryState.NOT_LOADED
result = await hass.config_entries.flow.async_configure(result["flow_id"], {}) result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
assert entry.state is config_entries.ConfigEntryState.NOT_LOADED
assert result["type"] == FlowResultType.SHOW_PROGRESS assert result["type"] == FlowResultType.SHOW_PROGRESS
assert result["step_id"] == "start_addon" assert result["step_id"] == "start_addon"
assert set_addon_options.call_args == call( assert set_addon_options.call_args == call(
@ -3776,6 +3776,7 @@ async def test_reconfigure_migrate_with_addon(
assert result["type"] == FlowResultType.FORM assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "instruct_unplug" assert result["step_id"] == "instruct_unplug"
assert entry.state is config_entries.ConfigEntryState.NOT_LOADED
result = await hass.config_entries.flow.async_configure(result["flow_id"], {}) result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
@ -3790,7 +3791,6 @@ async def test_reconfigure_migrate_with_addon(
}, },
) )
assert entry.state is config_entries.ConfigEntryState.NOT_LOADED
assert result["type"] == FlowResultType.SHOW_PROGRESS assert result["type"] == FlowResultType.SHOW_PROGRESS
assert result["step_id"] == "start_addon" assert result["step_id"] == "start_addon"
assert set_addon_options.call_args == call( assert set_addon_options.call_args == call(
@ -3918,6 +3918,7 @@ async def test_reconfigure_migrate_driver_ready_timeout(
assert result["type"] == FlowResultType.FORM assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "instruct_unplug" assert result["step_id"] == "instruct_unplug"
assert entry.state is config_entries.ConfigEntryState.NOT_LOADED
result = await hass.config_entries.flow.async_configure(result["flow_id"], {}) result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
@ -3932,7 +3933,6 @@ async def test_reconfigure_migrate_driver_ready_timeout(
}, },
) )
assert entry.state is config_entries.ConfigEntryState.NOT_LOADED
assert result["type"] == FlowResultType.SHOW_PROGRESS assert result["type"] == FlowResultType.SHOW_PROGRESS
assert result["step_id"] == "start_addon" assert result["step_id"] == "start_addon"
assert set_addon_options.call_args == call( assert set_addon_options.call_args == call(
@ -4108,6 +4108,7 @@ async def test_reconfigure_migrate_start_addon_failure(
assert result["type"] == FlowResultType.FORM assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "instruct_unplug" assert result["step_id"] == "instruct_unplug"
assert entry.state is config_entries.ConfigEntryState.NOT_LOADED
result = await hass.config_entries.flow.async_configure(result["flow_id"], {}) result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
@ -4202,6 +4203,7 @@ async def test_reconfigure_migrate_restore_failure(
assert result["type"] == FlowResultType.FORM assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "instruct_unplug" assert result["step_id"] == "instruct_unplug"
assert entry.state is config_entries.ConfigEntryState.NOT_LOADED
result = await hass.config_entries.flow.async_configure(result["flow_id"], {}) result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
@ -4367,6 +4369,7 @@ async def test_choose_serial_port_usb_ports_failure(
assert result["type"] == FlowResultType.FORM assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "instruct_unplug" assert result["step_id"] == "instruct_unplug"
assert entry.state is config_entries.ConfigEntryState.NOT_LOADED
with patch( with patch(
"homeassistant.components.zwave_js.config_flow.async_get_usb_ports", "homeassistant.components.zwave_js.config_flow.async_get_usb_ports",