From 8078e41cad84bf6052b44ffffa35080f2ede91c7 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 21 Feb 2025 13:22:06 -0600
Subject: [PATCH] Allow ignored thermobeacon devices to be set up from the user
flow (#139009)
Every few days we get an issue report about a device a user ignored and forgot about, and than can no longer get set up. Sometimes its a govee device, sometimes its a switchbot device, but the pattern is consistent.
Allow ignored devices to be selected in the user step and replace the ignored entry.
Same as #137056 and #137052 but for thermobeacon
---
.../components/thermobeacon/config_flow.py | 2 +-
.../thermobeacon/test_config_flow.py | 32 +++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/homeassistant/components/thermobeacon/config_flow.py b/homeassistant/components/thermobeacon/config_flow.py
index 08994a41008..6fa502716ca 100644
--- a/homeassistant/components/thermobeacon/config_flow.py
+++ b/homeassistant/components/thermobeacon/config_flow.py
@@ -72,7 +72,7 @@ class ThermoBeaconConfigFlow(ConfigFlow, domain=DOMAIN):
title=self._discovered_devices[address], data={}
)
- current_addresses = self._async_current_ids()
+ current_addresses = self._async_current_ids(include_ignore=False)
for discovery_info in async_discovered_service_info(self.hass, False):
address = discovery_info.address
if address in current_addresses or address in self._discovered_devices:
diff --git a/tests/components/thermobeacon/test_config_flow.py b/tests/components/thermobeacon/test_config_flow.py
index a26a2b70c5e..2194168c25d 100644
--- a/tests/components/thermobeacon/test_config_flow.py
+++ b/tests/components/thermobeacon/test_config_flow.py
@@ -79,6 +79,38 @@ async def test_async_step_user_with_found_devices(hass: HomeAssistant) -> None:
assert result2["result"].unique_id == "aa:bb:cc:dd:ee:ff"
+async def test_async_step_user_replace_ignored(hass: HomeAssistant) -> None:
+ """Test setup from service info can replace an ignored entry."""
+ entry = MockConfigEntry(
+ domain=DOMAIN,
+ unique_id=THERMOBEACON_SERVICE_INFO.address,
+ data={},
+ source=config_entries.SOURCE_IGNORE,
+ )
+ entry.add_to_hass(hass)
+ with patch(
+ "homeassistant.components.thermobeacon.config_flow.async_discovered_service_info",
+ return_value=[THERMOBEACON_SERVICE_INFO],
+ ):
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN,
+ context={"source": config_entries.SOURCE_USER},
+ )
+ assert result["type"] is FlowResultType.FORM
+ assert result["step_id"] == "user"
+ with patch(
+ "homeassistant.components.thermobeacon.async_setup_entry", return_value=True
+ ):
+ result2 = await hass.config_entries.flow.async_configure(
+ result["flow_id"],
+ user_input={"address": "aa:bb:cc:dd:ee:ff"},
+ )
+ assert result2["type"] is FlowResultType.CREATE_ENTRY
+ assert result2["title"] == "Lanyard/mini hygrometer EEFF"
+ assert result2["data"] == {}
+ assert result2["result"].unique_id == "aa:bb:cc:dd:ee:ff"
+
+
async def test_async_step_user_device_added_between_steps(hass: HomeAssistant) -> None:
"""Test the device gets added via another flow between steps."""
with patch(
--
GitLab