Skip to content

Fix homewizard_energy migration issues from #65594 #65718

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
balloob merged 2 commits into from
Feb 4, 2022
Merged

Fix homewizard_energy migration issues from #65594 #65718

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
7bc941e
Use imported method to create persistent_notification
DCSBL Feb 4, 2022
13e3a71
Test: Fix invalid domain and add test to prevent this
DCSBL Feb 4, 2022
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
11 changes: 6 additions & 5 deletions homeassistant/components/homewizard/config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from voluptuous import Required, Schema

from homeassistant import config_entries
from homeassistant.components import zeroconf
from homeassistant.components import persistent_notification, zeroconf
from homeassistant.const import CONF_IP_ADDRESS
from homeassistant.data_entry_flow import AbortFlow, FlowResult

Expand All @@ -32,13 +32,14 @@ async def async_step_import(self, import_config: dict) -> FlowResult:
"""Handle a flow initiated by older `homewizard_energy` component."""
_LOGGER.debug("config_flow async_step_import")

self.hass.components.persistent_notification.async_create(
(
persistent_notification.async_create(
self.hass,
title="HomeWizard Energy",
message=(
"The custom integration of HomeWizard Energy has been migrated to core. "
"You can safely remove the custom integration from the custom_integrations folder."
),
"HomeWizard Energy",
f"homewizard_energy_to_{DOMAIN}",
notification_id=f"homewizard_energy_to_{DOMAIN}",
)

return await self.async_step_user({CONF_IP_ADDRESS: import_config["host"]})
Expand Down
5 changes: 4 additions & 1 deletion tests/components/homewizard/test_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ async def test_init_accepts_and_migrates_old_entry(aioclient_mock, hass):

# Add original entry
original_entry = MockConfigEntry(
domain=DOMAIN,
domain="homewizard_energy",
data={CONF_IP_ADDRESS: "1.2.3.4"},
entry_id="old_id",
)
Expand Down Expand Up @@ -122,6 +122,9 @@ async def test_init_accepts_and_migrates_old_entry(aioclient_mock, hass):
)
imported_entry.add_to_hass(hass)

assert imported_entry.domain == DOMAIN
assert imported_entry.domain != original_entry.domain

# Add the entry_id to trigger migration
with patch(
"aiohwenergy.HomeWizardEnergy",
Expand Down