Skip to content

Commit

Permalink
Allow ignored oralb devices to be set up from the user flow (#137109)
Browse files Browse the repository at this point in the history
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 oralb
  • Loading branch information
bdraco authored and balloob committed Feb 2, 2025
1 parent 434a4eb commit 3b67dc3
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 1 deletion.
2 changes: 1 addition & 1 deletion homeassistant/components/oralb/config_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ async def async_step_user(
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:
Expand Down
30 changes: 30 additions & 0 deletions tests/components/oralb/test_config_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,36 @@ async def test_async_step_user_with_found_devices(hass: HomeAssistant) -> None:
assert result2["result"].unique_id == "78:DB:2F:C2:48:BE"


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=ORALB_SERVICE_INFO.address,
source=config_entries.SOURCE_IGNORE,
data={},
)
entry.add_to_hass(hass)
with patch(
"homeassistant.components.oralb.config_flow.async_discovered_service_info",
return_value=[ORALB_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.oralb.async_setup_entry", return_value=True):
result2 = await hass.config_entries.flow.async_configure(
result["flow_id"],
user_input={"address": "78:DB:2F:C2:48:BE"},
)
assert result2["type"] is FlowResultType.CREATE_ENTRY
assert result2["title"] == "Smart Series 7000 48BE"
assert result2["data"] == {}
assert result2["result"].unique_id == "78:DB:2F:C2:48:BE"


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(
Expand Down

0 comments on commit 3b67dc3

Please sign in to comment.