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

Don't abort on unknown error in nina config flow (#127908)

Browse Source
This commit is contained in:
epenet 2024-10-08 09:10:26 +02:00 committed by GitHub
parent 6df77ef94b
commit 1eb8d0fa1c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
homeassistant/components/nina/config_flow.py
View File

@ -116,7 +116,7 @@ class NinaConfigFlow(ConfigFlow, domain=DOMAIN):
errors["base"] = "cannot_connect" errors["base"] = "cannot_connect"
except Exception as err: # noqa: BLE001 except Exception as err: # noqa: BLE001
_LOGGER.exception("Unexpected exception: %s", err) _LOGGER.exception("Unexpected exception: %s", err)
return self.async_abort(reason="unknown") errors["base"] = "unknown"
self.regions = split_regions(self._all_region_codes_sorted, self.regions) self.regions = split_regions(self._all_region_codes_sorted, self.regions)
@ -199,7 +199,7 @@ class OptionsFlowHandler(OptionsFlow):
errors["base"] = "cannot_connect" errors["base"] = "cannot_connect"
except Exception as err: # noqa: BLE001 except Exception as err: # noqa: BLE001
_LOGGER.exception("Unexpected exception: %s", err) _LOGGER.exception("Unexpected exception: %s", err)
return self.async_abort(reason="unknown") errors["base"] = "unknown"
self.regions = split_regions(self._all_region_codes_sorted, self.regions) self.regions = split_regions(self._all_region_codes_sorted, self.regions)

6
homeassistant/components/nina/strings.json
View File

@ -38,10 +38,12 @@
} }
} }
}, },
"abort": {
"unknown": "[%key:common::config_flow::error::unknown%]"
},
"error": { "error": {
"no_selection": "[%key:component::nina::config::error::no_selection%]", "no_selection": "[%key:component::nina::config::error::no_selection%]",
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]", "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
"unknown": "[%key:common::config_flow::error::unknown%]"
} }
} }
} }

8
tests/components/nina/test_config_flow.py
View File

@ -89,7 +89,9 @@ async def test_step_user_unexpected_exception(hass: HomeAssistant) -> None:
DOMAIN, context={"source": SOURCE_USER}, data=deepcopy(DUMMY_DATA) DOMAIN, context={"source": SOURCE_USER}, data=deepcopy(DUMMY_DATA)
) )
assert result["type"] is FlowResultType.ABORT assert result["type"] is FlowResultType.FORM
assert result["errors"] == {"base": "unknown"}
hass.config_entries.flow.async_abort(result["flow_id"])
async def test_step_user(hass: HomeAssistant) -> None: async def test_step_user(hass: HomeAssistant) -> None:
@ -300,7 +302,9 @@ async def test_options_flow_unexpected_exception(hass: HomeAssistant) -> None:
result = await hass.config_entries.options.async_init(config_entry.entry_id) result = await hass.config_entries.options.async_init(config_entry.entry_id)
assert result["type"] is FlowResultType.ABORT assert result["type"] is FlowResultType.FORM
assert result["errors"] == {"base": "unknown"}
hass.config_entries.options.async_abort(result["flow_id"])
async def test_options_flow_entity_removal( async def test_options_flow_entity_removal(