Skip to content

[pull] dev from home-assistant:dev #829

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

Merged
merged 2 commits into from
Jun 22, 2025
Merged

[pull] dev from home-assistant:dev #829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d421bf
Fix regex patterns in foobot sensor tests (#147306)
mib1185 Jun 22, 2025
3734c4e
fix reconfig in case of no connection. (#147275)
Taraman17 Jun 22, 2025
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
4 changes: 1 addition & 3 deletions homeassistant/components/homee/config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,6 @@ async def async_step_reconfigure(
): str
}
),
description_placeholders={
"name": reconfigure_entry.runtime_data.settings.uid
},
description_placeholders={"name": str(reconfigure_entry.unique_id)},
errors=errors,
)
10 changes: 5 additions & 5 deletions tests/components/foobot/test_sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ async def test_default_setup(
) -> None:
"""Test the default setup."""
aioclient_mock.get(
re.compile("api.foobot.io/v2/owner/.*"),
re.compile(r"api\.foobot\.io/v2/owner/.*"),
text=await async_load_fixture(hass, "devices.json", "foobot"),
)
aioclient_mock.get(
re.compile("api.foobot.io/v2/device/.*"),
re.compile(r"api\.foobot\.io/v2/device/.*"),
text=await async_load_fixture(hass, "data.json", "foobot"),
)
assert await async_setup_component(hass, sensor.DOMAIN, {"sensor": VALID_CONFIG})
Expand All @@ -65,7 +65,7 @@ async def test_setup_timeout_error(
"""Expected failures caused by a timeout in API response."""
fake_async_add_entities = MagicMock()

aioclient_mock.get(re.compile("api.foobot.io/v2/owner/.*"), exc=TimeoutError())
aioclient_mock.get(re.compile(r"api\.foobot\.io/v2/owner/.*"), exc=TimeoutError())
with pytest.raises(PlatformNotReady):
await foobot.async_setup_platform(hass, VALID_CONFIG, fake_async_add_entities)

Expand All @@ -78,7 +78,7 @@ async def test_setup_permanent_error(

errors = [HTTPStatus.BAD_REQUEST, HTTPStatus.UNAUTHORIZED, HTTPStatus.FORBIDDEN]
for error in errors:
aioclient_mock.get(re.compile("api.foobot.io/v2/owner/.*"), status=error)
aioclient_mock.get(re.compile(r"api\.foobot\.io/v2/owner/.*"), status=error)
result = await foobot.async_setup_platform(
hass, VALID_CONFIG, fake_async_add_entities
)
Expand All @@ -93,7 +93,7 @@ async def test_setup_temporary_error(

errors = [HTTPStatus.TOO_MANY_REQUESTS, HTTPStatus.INTERNAL_SERVER_ERROR]
for error in errors:
aioclient_mock.get(re.compile("api.foobot.io/v2/owner/.*"), status=error)
aioclient_mock.get(re.compile(r"api\.foobot\.io/v2/owner/.*"), status=error)
with pytest.raises(PlatformNotReady):
await foobot.async_setup_platform(
hass, VALID_CONFIG, fake_async_add_entities
Expand Down
Loading