jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-09 22:37:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable v2 API support for HomeWizard P1 Meter (#146927)

Browse Source
This commit is contained in:
Duco Sebel 2025-06-16 14:11:35 +02:00 committed by GitHub
parent 4a9cbc79f2
commit 3283965b45
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/components/homewizard/__init__.py
View File

@ -23,9 +23,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: HomeWizardConfigEntry) -
api: HomeWizardEnergy api: HomeWizardEnergy
is_battery = entry.unique_id.startswith("HWE-BAT") if entry.unique_id else False if token := entry.data.get(CONF_TOKEN):
if (token := entry.data.get(CONF_TOKEN)) and is_battery:
api = HomeWizardEnergyV2( api = HomeWizardEnergyV2(
entry.data[CONF_IP_ADDRESS], entry.data[CONF_IP_ADDRESS],
token=token, token=token,
@ -37,8 +35,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: HomeWizardConfigEntry) -
clientsession=async_get_clientsession(hass), clientsession=async_get_clientsession(hass),
) )
if is_battery: await async_check_v2_support_and_create_issue(hass, entry)
await async_check_v2_support_and_create_issue(hass, entry)
coordinator = HWEnergyDeviceUpdateCoordinator(hass, entry, api) coordinator = HWEnergyDeviceUpdateCoordinator(hass, entry, api)
try: try:

31
tests/components/homewizard/test_init.py
View File

@ -10,7 +10,6 @@ import pytest
from homeassistant.components.homewizard.const import DOMAIN from homeassistant.components.homewizard.const import DOMAIN
from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState
from homeassistant.const import CONF_IP_ADDRESS, CONF_TOKEN
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from tests.common import MockConfigEntry, async_fire_time_changed from tests.common import MockConfigEntry, async_fire_time_changed
@ -58,36 +57,6 @@ async def test_load_unload_v2(
assert mock_config_entry_v2.state is ConfigEntryState.NOT_LOADED assert mock_config_entry_v2.state is ConfigEntryState.NOT_LOADED
async def test_load_unload_v2_as_v1(
hass: HomeAssistant,
mock_homewizardenergy: MagicMock,
) -> None:
"""Test loading and unloading of integration with v2 config, but without using it."""
# Simulate v2 config but as a P1 Meter
mock_config_entry = MockConfigEntry(
title="Device",
domain=DOMAIN,
data={
CONF_IP_ADDRESS: "127.0.0.1",
CONF_TOKEN: "00112233445566778899ABCDEFABCDEF",
},
unique_id="HWE-P1_5c2fafabcdef",
)
mock_config_entry.add_to_hass(hass)
await hass.config_entries.async_setup(mock_config_entry.entry_id)
await hass.async_block_till_done()
assert mock_config_entry.state is ConfigEntryState.LOADED
assert len(mock_homewizardenergy.combined.mock_calls) == 1
await hass.config_entries.async_unload(mock_config_entry.entry_id)
await hass.async_block_till_done()
assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
async def test_load_failed_host_unavailable( async def test_load_failed_host_unavailable(
hass: HomeAssistant, hass: HomeAssistant,
mock_config_entry: MockConfigEntry, mock_config_entry: MockConfigEntry,