evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent nut config flow error when checking ignored entries (#38372)

Browse source
This commit is contained in:
J. Nick Koston 2020-07-29 11:20:19 -10:00 • committed by GitHub
parent 13e8e28778
commit 1b593e3169
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
homeassistant/components/nut/config_flow.py
View file

@ -216,6 +216,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
existing_host_port_aliases = { existing_host_port_aliases = {
_format_host_port_alias(entry.data) _format_host_port_alias(entry.data)
for entry in self._async_current_entries() for entry in self._async_current_entries()
if CONF_HOST in entry.data
} }
return _format_host_port_alias(user_input) in existing_host_port_aliases return _format_host_port_alias(user_input) in existing_host_port_aliases

20
tests/components/nut/test_config_flow.py
View file

@ -247,7 +247,25 @@ async def test_form_import_dupe(hass):
entry.add_to_hass(hass) entry.add_to_hass(hass)
result = await hass.config_entries.flow.async_init( result = await hass.config_entries.flow.async_init(
DOMAIN, context={"source": "import"}, data=VALID_CONFIG DOMAIN, context={"source": config_entries.SOURCE_IMPORT}, data=VALID_CONFIG
)
assert result["type"] == "abort"
assert result["reason"] == "already_configured"
async def test_form_import_with_ignored_entry(hass):
"""Test we get abort on duplicate import when there is an ignored one."""
await setup.async_setup_component(hass, "persistent_notification", {})
entry = MockConfigEntry(domain=DOMAIN, data=VALID_CONFIG)
entry.add_to_hass(hass)
ignored_entry = MockConfigEntry(
domain=DOMAIN, data={}, source=config_entries.SOURCE_IGNORE
)
ignored_entry.add_to_hass(hass)
result = await hass.config_entries.flow.async_init(
DOMAIN, context={"source": config_entries.SOURCE_IMPORT}, data=VALID_CONFIG
) )
assert result["type"] == "abort" assert result["type"] == "abort"
assert result["reason"] == "already_configured" assert result["reason"] == "already_configured"