Allow ignored qingping devices to be set up from the user flow (#137111)
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 qingpingpull/137390/head
parent
73b874c5e6
commit
63bd67f6cd
|
@ -98,7 +98,7 @@ class QingpingConfigFlow(ConfigFlow, domain=DOMAIN):
|
||||||
title=self._discovered_devices[address], data={}
|
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):
|
for discovery_info in async_discovered_service_info(self.hass, False):
|
||||||
address = discovery_info.address
|
address = discovery_info.address
|
||||||
if address in current_addresses or address in self._discovered_devices:
|
if address in current_addresses or address in self._discovered_devices:
|
||||||
|
|
|
@ -114,6 +114,38 @@ async def test_async_step_user_with_found_devices(hass: HomeAssistant) -> None:
|
||||||
assert result2["result"].unique_id == "aa:bb:cc:dd:ee:ff"
|
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=LIGHT_AND_SIGNAL_SERVICE_INFO.address,
|
||||||
|
source=config_entries.SOURCE_IGNORE,
|
||||||
|
data={},
|
||||||
|
)
|
||||||
|
entry.add_to_hass(hass)
|
||||||
|
with patch(
|
||||||
|
"homeassistant.components.qingping.config_flow.async_discovered_service_info",
|
||||||
|
return_value=[LIGHT_AND_SIGNAL_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.qingping.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"] == "Motion & Light 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:
|
async def test_async_step_user_device_added_between_steps(hass: HomeAssistant) -> None:
|
||||||
"""Test the device gets added via another flow between steps."""
|
"""Test the device gets added via another flow between steps."""
|
||||||
with patch(
|
with patch(
|
||||||
|
|
Loading…
Reference in New Issue