From 20c3fdfe1454dbdc845d1c6c33d934caac294ae8 Mon Sep 17 00:00:00 2001 From: Robert Svensson Date: Wed, 9 Dec 2020 17:48:16 +0100 Subject: [PATCH] Fix ignored Axis config entries doesn't break set up of new entries (#44062) --- homeassistant/components/axis/config_flow.py | 3 ++- tests/components/axis/test_config_flow.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/axis/config_flow.py b/homeassistant/components/axis/config_flow.py index ea1db54855b..8d52b7f8d9f 100644 --- a/homeassistant/components/axis/config_flow.py +++ b/homeassistant/components/axis/config_flow.py @@ -5,6 +5,7 @@ from ipaddress import ip_address import voluptuous as vol from homeassistant import config_entries +from homeassistant.config_entries import SOURCE_IGNORE from homeassistant.const import ( CONF_HOST, CONF_MAC, @@ -122,7 +123,7 @@ class AxisFlowHandler(config_entries.ConfigFlow, domain=AXIS_DOMAIN): same_model = [ entry.data[CONF_NAME] for entry in self.hass.config_entries.async_entries(AXIS_DOMAIN) - if entry.data[CONF_MODEL] == model + if entry.source != SOURCE_IGNORE and entry.data[CONF_MODEL] == model ] name = model diff --git a/tests/components/axis/test_config_flow.py b/tests/components/axis/test_config_flow.py index 24f888ea6ef..b9dceec7477 100644 --- a/tests/components/axis/test_config_flow.py +++ b/tests/components/axis/test_config_flow.py @@ -8,7 +8,7 @@ from homeassistant.components.axis.const import ( DEFAULT_STREAM_PROFILE, DOMAIN as AXIS_DOMAIN, ) -from homeassistant.config_entries import SOURCE_USER, SOURCE_ZEROCONF +from homeassistant.config_entries import SOURCE_IGNORE, SOURCE_USER, SOURCE_ZEROCONF from homeassistant.const import ( CONF_HOST, CONF_MAC, @@ -31,6 +31,8 @@ from tests.common import MockConfigEntry async def test_flow_manual_configuration(hass): """Test that config flow works.""" + MockConfigEntry(domain=AXIS_DOMAIN, source=SOURCE_IGNORE).add_to_hass(hass) + result = await hass.config_entries.flow.async_init( AXIS_DOMAIN, context={"source": SOURCE_USER} )