Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix timeout issue on Roomba integration when adding a new device #129230

Merged
merged 6 commits into from
Oct 30, 2024
Merged

Fix timeout issue on Roomba integration when adding a new device #129230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
52881f8
Update const.py
AuroreVgn Oct 26, 2024
b8f097f
Update config_flow.py
AuroreVgn Oct 26, 2024
55e0b72
Update homeassistant/components/roomba/const.py
AuroreVgn Oct 27, 2024
6cac804
Update test_config_flow.py
AuroreVgn Oct 28, 2024
ab082cc
Update tests/components/roomba/test_config_flow.py
AuroreVgn Oct 28, 2024
57efd05
Use constant for DEFAULT_DELAY in tests
jbouwh Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion homeassistant/components/roomba/config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str,
address=data[CONF_HOST],
blid=data[CONF_BLID],
password=data[CONF_PASSWORD],
continuous=False,
continuous=True,
delay=data[CONF_DELAY],
)
)
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/roomba/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
CONF_BLID = "blid"
DEFAULT_CERT = "/etc/ssl/certs/ca-certificates.crt"
DEFAULT_CONTINUOUS = True
DEFAULT_DELAY = 1
DEFAULT_DELAY = 30
ROOMBA_SESSION = "roomba_session"
29 changes: 17 additions & 12 deletions tests/components/roomba/test_config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@

from homeassistant.components import dhcp, zeroconf
from homeassistant.components.roomba import config_flow
from homeassistant.components.roomba.const import CONF_BLID, CONF_CONTINUOUS, DOMAIN
from homeassistant.components.roomba.const import (
CONF_BLID,
CONF_CONTINUOUS,
DEFAULT_DELAY,
DOMAIN,
)
from homeassistant.config_entries import (
SOURCE_DHCP,
SOURCE_IGNORE,
Expand Down Expand Up @@ -206,7 +211,7 @@ async def test_form_user_discovery_and_password_fetch(hass: HomeAssistant) -> No
assert result3["data"] == {
CONF_BLID: "BLID",
CONF_CONTINUOUS: True,
CONF_DELAY: 1,
CONF_DELAY: DEFAULT_DELAY,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You also need to update the other occurrences and addd the import.

Do a git pull to make sure you include the applied suggestions.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not familiar to this process, could you please tell me how to do a git pull ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like you used git clone to clone a he HA core repository. But let me help to commit the changes for you.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can commit for me, do I need do to something ?

CONF_HOST: MOCK_IP,
CONF_PASSWORD: "password",
}
Expand Down Expand Up @@ -331,7 +336,7 @@ async def test_form_user_discovery_manual_and_auto_password_fetch(
assert result4["data"] == {
CONF_BLID: "BLID",
CONF_CONTINUOUS: True,
CONF_DELAY: 1,
CONF_DELAY: DEFAULT_DELAY,
CONF_HOST: MOCK_IP,
CONF_PASSWORD: "password",
}
Expand Down Expand Up @@ -468,7 +473,7 @@ async def test_form_user_discovery_no_devices_found_and_auto_password_fetch(
assert result3["data"] == {
CONF_BLID: "BLID",
CONF_CONTINUOUS: True,
CONF_DELAY: 1,
CONF_DELAY: DEFAULT_DELAY,
CONF_HOST: MOCK_IP,
CONF_PASSWORD: "password",
}
Expand Down Expand Up @@ -541,7 +546,7 @@ async def test_form_user_discovery_no_devices_found_and_password_fetch_fails(
assert result4["data"] == {
CONF_BLID: "BLID",
CONF_CONTINUOUS: True,
CONF_DELAY: 1,
CONF_DELAY: DEFAULT_DELAY,
CONF_HOST: MOCK_IP,
CONF_PASSWORD: "password",
}
Expand Down Expand Up @@ -677,7 +682,7 @@ async def test_form_user_discovery_and_password_fetch_gets_connection_refused(
assert result4["data"] == {
CONF_BLID: "BLID",
CONF_CONTINUOUS: True,
CONF_DELAY: 1,
CONF_DELAY: DEFAULT_DELAY,
CONF_HOST: MOCK_IP,
CONF_PASSWORD: "password",
}
Expand Down Expand Up @@ -738,7 +743,7 @@ async def test_dhcp_discovery_and_roomba_discovery_finds(
assert result2["data"] == {
CONF_BLID: "BLID",
CONF_CONTINUOUS: True,
CONF_DELAY: 1,
CONF_DELAY: DEFAULT_DELAY,
CONF_HOST: MOCK_IP,
CONF_PASSWORD: "password",
}
Expand Down Expand Up @@ -816,7 +821,7 @@ async def test_dhcp_discovery_falls_back_to_manual(
assert result4["data"] == {
CONF_BLID: "BLID",
CONF_CONTINUOUS: True,
CONF_DELAY: 1,
CONF_DELAY: DEFAULT_DELAY,
CONF_HOST: MOCK_IP,
CONF_PASSWORD: "password",
}
Expand Down Expand Up @@ -886,7 +891,7 @@ async def test_dhcp_discovery_no_devices_falls_back_to_manual(
assert result3["data"] == {
CONF_BLID: "BLID",
CONF_CONTINUOUS: True,
CONF_DELAY: 1,
CONF_DELAY: DEFAULT_DELAY,
CONF_HOST: MOCK_IP,
CONF_PASSWORD: "password",
}
Expand Down Expand Up @@ -1119,10 +1124,10 @@ async def test_options_flow(

result = await hass.config_entries.options.async_configure(
result["flow_id"],
user_input={CONF_CONTINUOUS: True, CONF_DELAY: 1},
user_input={CONF_CONTINUOUS: True, CONF_DELAY: DEFAULT_DELAY},
)
await hass.async_block_till_done()

assert result["type"] is FlowResultType.CREATE_ENTRY
assert result["data"] == {CONF_CONTINUOUS: True, CONF_DELAY: 1}
assert config_entry.options == {CONF_CONTINUOUS: True, CONF_DELAY: 1}
assert result["data"] == {CONF_CONTINUOUS: True, CONF_DELAY: DEFAULT_DELAY}
assert config_entry.options == {CONF_CONTINUOUS: True, CONF_DELAY: DEFAULT_DELAY}