Electric-Special/ha-core
1
0
Fork 0
mirror of https://github.com/Electric-Special/ha-core.git synced 2026-03-21 06:05:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor device classes for LCN (#156791)

Browse Source
This commit is contained in:
Andre Lengwenus
2025-11-18 11:39:23 +01:00
committed by GitHub
parent c32a471573
commit 0dfa037aa8
15 changed files with 73 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
homeassistant/components/lcn/entity.py
View File

@@ -2,6 +2,8 @@
from collections.abc import Callable
from pypck.device import DeviceConnection
from homeassistant.const import CONF_ADDRESS, CONF_DOMAIN, CONF_NAME
from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.entity import Entity
@@ -10,7 +12,6 @@ from homeassistant.helpers.typing import ConfigType
from .const import CONF_DOMAIN_DATA, DOMAIN
from .helpers import (
AddressType,
DeviceConnectionType,
InputType,
LcnConfigEntry,
generate_unique_id,
@@ -23,7 +24,7 @@ class LcnEntity(Entity):
"""Parent class for all entities associated with the LCN component."""
_attr_has_entity_name = True
device_connection: DeviceConnectionType
device_connection: DeviceConnection
def __init__(
self,

10
homeassistant/components/lcn/helpers.py
View File

@@ -11,6 +11,7 @@ from typing import cast
import pypck
from pypck.connection import PchkConnectionManager
from pypck.device import DeviceConnection
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import (
@@ -48,7 +49,7 @@ class LcnRuntimeData:
connection: PchkConnectionManager
"""Connection to PCHK host."""
device_connections: dict[str, DeviceConnectionType]
device_connections: dict[str, DeviceConnection]
"""Logical addresses of devices connected to the host."""
add_entities_callbacks: dict[str, Callable[[Iterable[ConfigType]], None]]
@@ -59,7 +60,6 @@ class LcnRuntimeData:
type LcnConfigEntry = ConfigEntry[LcnRuntimeData]
type AddressType = tuple[int, int, bool]
type DeviceConnectionType = pypck.module.ModuleConnection | pypck.module.GroupConnection
type InputType = type[pypck.inputs.Input]
@@ -82,11 +82,11 @@ DOMAIN_LOOKUP = {
def get_device_connection(
hass: HomeAssistant, address: AddressType, config_entry: LcnConfigEntry
) -> DeviceConnectionType:
) -> DeviceConnection:
"""Return a lcn device_connection."""
host_connection = config_entry.runtime_data.connection
addr = pypck.lcn_addr.LcnAddr(*address)
return host_connection.get_address_conn(addr)
return host_connection.get_device_connection(addr)
def get_resource(domain_name: str, domain_data: ConfigType) -> str:
@@ -246,7 +246,7 @@ def register_lcn_address_devices(
async def async_update_device_config(
device_connection: DeviceConnectionType, device_config: ConfigType
device_connection: DeviceConnection, device_config: ConfigType
) -> None:
"""Fill missing values in device_config with infos from LCN bus."""
# fetch serial info if device is module

2
homeassistant/components/lcn/manifest.json
View File

@@ -9,5 +9,5 @@
"iot_class": "local_polling",
"loggers": ["pypck"],
"quality_scale": "bronze",
"requirements": ["pypck==0.9.2", "lcn-frontend==0.2.7"]
"requirements": ["pypck==0.9.3", "lcn-frontend==0.2.7"]
}

5
homeassistant/components/lcn/services.py
View File

@@ -3,6 +3,7 @@
from enum import StrEnum, auto
import pypck
from pypck.device import DeviceConnection
import voluptuous as vol
from homeassistant.const import (
@@ -48,7 +49,7 @@ from .const import (
VAR_UNITS,
VARIABLES,
)
from .helpers import DeviceConnectionType, LcnConfigEntry, is_states_string
from .helpers import LcnConfigEntry, is_states_string
class LcnServiceCall:
@@ -65,7 +66,7 @@ class LcnServiceCall:
"""Initialize service call."""
self.hass = hass
def get_device_connection(self, service: ServiceCall) -> DeviceConnectionType:
def get_device_connection(self, service: ServiceCall) -> DeviceConnection:
"""Get address connection object."""
entries: list[LcnConfigEntry] = self.hass.config_entries.async_loaded_entries(
DOMAIN

6
homeassistant/components/lcn/websocket.py
View File

@@ -7,6 +7,7 @@ from functools import wraps
from typing import Any, Final
import lcn_frontend as lcn_panel
from pypck.device import DeviceConnection
import voluptuous as vol
from homeassistant.components import panel_custom, websocket_api
@@ -37,7 +38,6 @@ from .const import (
DOMAIN,
)
from .helpers import (
DeviceConnectionType,
LcnConfigEntry,
async_update_device_config,
generate_unique_id,
@@ -182,7 +182,7 @@ async def websocket_scan_devices(
host_connection = config_entry.runtime_data.connection
await host_connection.scan_modules()
for device_connection in host_connection.address_conns.values():
for device_connection in host_connection.device_connections.values():
if not device_connection.is_group:
await async_create_or_update_device_in_config_entry(
hass, device_connection, config_entry
@@ -421,7 +421,7 @@ async def websocket_delete_entity(
async def async_create_or_update_device_in_config_entry(
hass: HomeAssistant,
device_connection: DeviceConnectionType,
device_connection: DeviceConnection,
config_entry: LcnConfigEntry,
) -> None:
"""Create or update device in config_entry according to given device_connection."""

2
requirements_all.txt generated
View File

@@ -2269,7 +2269,7 @@ pypaperless==4.1.1
pypca==0.0.7
# homeassistant.components.lcn
pypck==0.9.2
pypck==0.9.3
# homeassistant.components.pglab
pypglab==0.0.5

2
requirements_test_all.txt generated
View File

@@ -1892,7 +1892,7 @@ pypalazzetti==0.1.20
pypaperless==4.1.1
# homeassistant.components.lcn
pypck==0.9.2
pypck==0.9.3
# homeassistant.components.pglab
pypglab==0.0.5

23
tests/components/lcn/conftest.py
View File

@@ -6,7 +6,7 @@ from unittest.mock import AsyncMock, Mock, patch
import pypck
from pypck import lcn_defs
from pypck.module import GroupConnection, ModuleConnection, Serials
from pypck.device import DeviceConnection, Serials
import pytest
from homeassistant.components.lcn import PchkConnectionManager
@@ -22,7 +22,7 @@ from tests.common import MockConfigEntry, load_fixture
LATEST_CONFIG_ENTRY_VERSION = (LcnFlowHandler.VERSION, LcnFlowHandler.MINOR_VERSION)
class MockModuleConnection(ModuleConnection):
class MockDeviceConnection(DeviceConnection):
"""Fake a LCN module connection."""
request_name = AsyncMock(return_value="TestModule")
@@ -49,12 +49,6 @@ class MockModuleConnection(ModuleConnection):
self._serials_known.set()
class MockGroupConnection(GroupConnection):
"""Fake a LCN group connection."""
send_command = AsyncMock(return_value=True)
class MockPchkConnectionManager(PchkConnectionManager):
"""Fake connection handler."""
@@ -67,15 +61,10 @@ class MockPchkConnectionManager(PchkConnectionManager):
async def async_close(self) -> None:
"""Mock closing a connection to PCHK."""
@patch.object(pypck.connection, "ModuleConnection", MockModuleConnection)
def get_module_conn(self, addr):
"""Get LCN module connection."""
return super().get_module_conn(addr)
@patch.object(pypck.connection, "GroupConnection", MockGroupConnection)
def get_group_conn(self, addr):
"""Get LCN group connection."""
return super().get_group_conn(addr)
@patch.object(pypck.connection, "DeviceConnection", MockDeviceConnection)
def get_device_connection(self, addr):
"""Get LCN device connection."""
return super().get_device_connection(addr)
scan_modules = AsyncMock()
send_command = AsyncMock()

8
tests/components/lcn/test_climate.py
View File

@@ -29,7 +29,7 @@ from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ServiceValidationError
from homeassistant.helpers import entity_registry as er
from .conftest import MockConfigEntry, MockModuleConnection, init_integration
from .conftest import MockConfigEntry, MockDeviceConnection, init_integration
from tests.common import snapshot_platform
@@ -51,7 +51,7 @@ async def test_set_hvac_mode_heat(hass: HomeAssistant, entry: MockConfigEntry) -
"""Test the hvac mode is set to heat."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "lock_regulator") as lock_regulator:
with patch.object(MockDeviceConnection, "lock_regulator") as lock_regulator:
await hass.services.async_call(
DOMAIN_CLIMATE,
SERVICE_SET_HVAC_MODE,
@@ -106,7 +106,7 @@ async def test_set_hvac_mode_off(hass: HomeAssistant, entry: MockConfigEntry) ->
"""Test the hvac mode is set off."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "lock_regulator") as lock_regulator:
with patch.object(MockDeviceConnection, "lock_regulator") as lock_regulator:
state = hass.states.get("climate.testmodule_climate1")
state.state = HVACMode.HEAT
@@ -154,7 +154,7 @@ async def test_set_temperature(hass: HomeAssistant, entry: MockConfigEntry) -> N
"""Test the temperature is set."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "var_abs") as var_abs:
with patch.object(MockDeviceConnection, "var_abs") as var_abs:
state = hass.states.get("climate.testmodule_climate1")
state.state = HVACMode.HEAT

16
tests/components/lcn/test_cover.py
View File

@@ -32,7 +32,7 @@ from homeassistant.const import (
from homeassistant.core import HomeAssistant
from homeassistant.helpers import entity_registry as er
from .conftest import MockConfigEntry, MockModuleConnection, init_integration
from .conftest import MockConfigEntry, MockDeviceConnection, init_integration
from tests.common import snapshot_platform
@@ -60,7 +60,7 @@ async def test_outputs_open(hass: HomeAssistant, entry: MockConfigEntry) -> None
await init_integration(hass, entry)
with patch.object(
MockModuleConnection, "control_motor_outputs"
MockDeviceConnection, "control_motor_outputs"
) as control_motor_outputs:
state = hass.states.get(COVER_OUTPUTS)
assert state is not None
@@ -109,7 +109,7 @@ async def test_outputs_close(hass: HomeAssistant, entry: MockConfigEntry) -> Non
await init_integration(hass, entry)
with patch.object(
MockModuleConnection, "control_motor_outputs"
MockDeviceConnection, "control_motor_outputs"
) as control_motor_outputs:
await hass.services.async_call(
DOMAIN_COVER,
@@ -161,7 +161,7 @@ async def test_outputs_stop(hass: HomeAssistant, entry: MockConfigEntry) -> None
await init_integration(hass, entry)
with patch.object(
MockModuleConnection, "control_motor_outputs"
MockDeviceConnection, "control_motor_outputs"
) as control_motor_outputs:
await hass.services.async_call(
DOMAIN_COVER,
@@ -209,7 +209,7 @@ async def test_relays_open(hass: HomeAssistant, entry: MockConfigEntry) -> None:
await init_integration(hass, entry)
with patch.object(
MockModuleConnection, "control_motor_relays"
MockDeviceConnection, "control_motor_relays"
) as control_motor_relays:
state = hass.states.get(COVER_RELAYS)
assert state is not None
@@ -258,7 +258,7 @@ async def test_relays_close(hass: HomeAssistant, entry: MockConfigEntry) -> None
await init_integration(hass, entry)
with patch.object(
MockModuleConnection, "control_motor_relays"
MockDeviceConnection, "control_motor_relays"
) as control_motor_relays:
await hass.services.async_call(
DOMAIN_COVER,
@@ -310,7 +310,7 @@ async def test_relays_stop(hass: HomeAssistant, entry: MockConfigEntry) -> None:
await init_integration(hass, entry)
with patch.object(
MockModuleConnection, "control_motor_relays"
MockDeviceConnection, "control_motor_relays"
) as control_motor_relays:
await hass.services.async_call(
DOMAIN_COVER,
@@ -375,7 +375,7 @@ async def test_relays_set_position(
await init_integration(hass, entry)
with patch.object(
MockModuleConnection, "control_motor_relays_position"
MockDeviceConnection, "control_motor_relays_position"
) as control_motor_relays_position:
state = hass.states.get(entity_id)
assert state is not None

12
tests/components/lcn/test_light.py
View File

@@ -25,7 +25,7 @@ from homeassistant.const import (
from homeassistant.core import HomeAssistant
from homeassistant.helpers import entity_registry as er
from .conftest import MockConfigEntry, MockModuleConnection, init_integration
from .conftest import MockConfigEntry, MockDeviceConnection, init_integration
from tests.common import snapshot_platform
@@ -51,7 +51,7 @@ async def test_output_turn_on(hass: HomeAssistant, entry: MockConfigEntry) -> No
"""Test the output light turns on."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "toggle_output") as toggle_output:
with patch.object(MockDeviceConnection, "toggle_output") as toggle_output:
# command failed
toggle_output.return_value = False
@@ -92,7 +92,7 @@ async def test_output_turn_on_with_attributes(
"""Test the output light turns on."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "dim_output") as dim_output:
with patch.object(MockDeviceConnection, "dim_output") as dim_output:
dim_output.return_value = True
await hass.services.async_call(
@@ -117,7 +117,7 @@ async def test_output_turn_off(hass: HomeAssistant, entry: MockConfigEntry) -> N
"""Test the output light turns off."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "toggle_output") as toggle_output:
with patch.object(MockDeviceConnection, "toggle_output") as toggle_output:
await hass.services.async_call(
DOMAIN_LIGHT,
SERVICE_TURN_ON,
@@ -163,7 +163,7 @@ async def test_relay_turn_on(hass: HomeAssistant, entry: MockConfigEntry) -> Non
"""Test the relay light turns on."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "control_relays") as control_relays:
with patch.object(MockDeviceConnection, "control_relays") as control_relays:
states = [RelayStateModifier.NOCHANGE] * 8
states[0] = RelayStateModifier.ON
@@ -205,7 +205,7 @@ async def test_relay_turn_off(hass: HomeAssistant, entry: MockConfigEntry) -> No
"""Test the relay light turns off."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "control_relays") as control_relays:
with patch.object(MockDeviceConnection, "control_relays") as control_relays:
states = [RelayStateModifier.NOCHANGE] * 8
states[0] = RelayStateModifier.OFF

4
tests/components/lcn/test_scene.py
View File

@@ -15,7 +15,7 @@ from homeassistant.const import (
from homeassistant.core import HomeAssistant
from homeassistant.helpers import entity_registry as er
from .conftest import MockConfigEntry, MockModuleConnection, init_integration
from .conftest import MockConfigEntry, MockDeviceConnection, init_integration
from tests.common import snapshot_platform
@@ -39,7 +39,7 @@ async def test_scene_activate(
) -> None:
"""Test the scene is activated."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "activate_scene") as activate_scene:
with patch.object(MockDeviceConnection, "activate_scene") as activate_scene:
await hass.services.async_call(
DOMAIN_SCENE,
SERVICE_TURN_ON,

40
tests/components/lcn/test_services.py
View File

@@ -35,7 +35,7 @@ from homeassistant.setup import async_setup_component
from .conftest import (
MockConfigEntry,
MockModuleConnection,
MockDeviceConnection,
get_device,
init_integration,
)
@@ -49,7 +49,7 @@ async def test_service_output_abs(
await async_setup_component(hass, "persistent_notification", {})
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "dim_output") as dim_output:
with patch.object(MockDeviceConnection, "dim_output") as dim_output:
await hass.services.async_call(
DOMAIN,
LcnService.OUTPUT_ABS,
@@ -73,7 +73,7 @@ async def test_service_output_rel(
await async_setup_component(hass, "persistent_notification", {})
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "rel_output") as rel_output:
with patch.object(MockDeviceConnection, "rel_output") as rel_output:
await hass.services.async_call(
DOMAIN,
LcnService.OUTPUT_REL,
@@ -96,7 +96,7 @@ async def test_service_output_toggle(
await async_setup_component(hass, "persistent_notification", {})
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "toggle_output") as toggle_output:
with patch.object(MockDeviceConnection, "toggle_output") as toggle_output:
await hass.services.async_call(
DOMAIN,
LcnService.OUTPUT_TOGGLE,
@@ -119,7 +119,7 @@ async def test_service_relays(
await async_setup_component(hass, "persistent_notification", {})
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "control_relays") as control_relays:
with patch.object(MockDeviceConnection, "control_relays") as control_relays:
await hass.services.async_call(
DOMAIN,
LcnService.RELAYS,
@@ -137,7 +137,7 @@ async def test_service_relays(
# wrong states string
with (
patch.object(MockModuleConnection, "control_relays") as control_relays,
patch.object(MockDeviceConnection, "control_relays") as control_relays,
pytest.raises(HomeAssistantError) as exc_info,
):
await hass.services.async_call(
@@ -161,7 +161,7 @@ async def test_service_led(
await async_setup_component(hass, "persistent_notification", {})
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "control_led") as control_led:
with patch.object(MockDeviceConnection, "control_led") as control_led:
await hass.services.async_call(
DOMAIN,
LcnService.LED,
@@ -187,7 +187,7 @@ async def test_service_var_abs(
await async_setup_component(hass, "persistent_notification", {})
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "var_abs") as var_abs:
with patch.object(MockDeviceConnection, "var_abs") as var_abs:
await hass.services.async_call(
DOMAIN,
LcnService.VAR_ABS,
@@ -213,7 +213,7 @@ async def test_service_var_rel(
await async_setup_component(hass, "persistent_notification", {})
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "var_rel") as var_rel:
with patch.object(MockDeviceConnection, "var_rel") as var_rel:
await hass.services.async_call(
DOMAIN,
LcnService.VAR_REL,
@@ -243,7 +243,7 @@ async def test_service_var_reset(
await async_setup_component(hass, "persistent_notification", {})
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "var_reset") as var_reset:
with patch.object(MockDeviceConnection, "var_reset") as var_reset:
await hass.services.async_call(
DOMAIN,
LcnService.VAR_RESET,
@@ -265,7 +265,7 @@ async def test_service_lock_regulator(
await async_setup_component(hass, "persistent_notification", {})
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "lock_regulator") as lock_regulator:
with patch.object(MockDeviceConnection, "lock_regulator") as lock_regulator:
await hass.services.async_call(
DOMAIN,
LcnService.LOCK_REGULATOR,
@@ -288,7 +288,7 @@ async def test_service_send_keys(
await async_setup_component(hass, "persistent_notification", {})
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "send_keys") as send_keys:
with patch.object(MockDeviceConnection, "send_keys") as send_keys:
await hass.services.async_call(
DOMAIN,
LcnService.SEND_KEYS,
@@ -323,7 +323,7 @@ async def test_service_send_keys_hit_deferred(
# success
with patch.object(
MockModuleConnection, "send_keys_hit_deferred"
MockDeviceConnection, "send_keys_hit_deferred"
) as send_keys_hit_deferred:
await hass.services.async_call(
DOMAIN,
@@ -344,7 +344,7 @@ async def test_service_send_keys_hit_deferred(
# wrong key action
with (
patch.object(
MockModuleConnection, "send_keys_hit_deferred"
MockDeviceConnection, "send_keys_hit_deferred"
) as send_keys_hit_deferred,
pytest.raises(ServiceValidationError) as exc_info,
):
@@ -372,7 +372,7 @@ async def test_service_lock_keys(
await async_setup_component(hass, "persistent_notification", {})
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "lock_keys") as lock_keys:
with patch.object(MockDeviceConnection, "lock_keys") as lock_keys:
await hass.services.async_call(
DOMAIN,
LcnService.LOCK_KEYS,
@@ -391,7 +391,7 @@ async def test_service_lock_keys(
# wrong states string
with (
patch.object(MockModuleConnection, "lock_keys") as lock_keys,
patch.object(MockDeviceConnection, "lock_keys") as lock_keys,
pytest.raises(HomeAssistantError) as exc_info,
):
await hass.services.async_call(
@@ -418,7 +418,7 @@ async def test_service_lock_keys_tab_a_temporary(
# success
with patch.object(
MockModuleConnection, "lock_keys_tab_a_temporary"
MockDeviceConnection, "lock_keys_tab_a_temporary"
) as lock_keys_tab_a_temporary:
await hass.services.async_call(
DOMAIN,
@@ -442,7 +442,7 @@ async def test_service_lock_keys_tab_a_temporary(
# wrong table
with (
patch.object(
MockModuleConnection, "lock_keys_tab_a_temporary"
MockDeviceConnection, "lock_keys_tab_a_temporary"
) as lock_keys_tab_a_temporary,
pytest.raises(ServiceValidationError) as exc_info,
):
@@ -470,7 +470,7 @@ async def test_service_dyn_text(
await async_setup_component(hass, "persistent_notification", {})
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "dyn_text") as dyn_text:
with patch.object(MockDeviceConnection, "dyn_text") as dyn_text:
await hass.services.async_call(
DOMAIN,
LcnService.DYN_TEXT,
@@ -493,7 +493,7 @@ async def test_service_pck(
await async_setup_component(hass, "persistent_notification", {})
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "pck") as pck:
with patch.object(MockDeviceConnection, "pck") as pck:
await hass.services.async_call(
DOMAIN,
LcnService.PCK,

18
tests/components/lcn/test_switch.py
View File

@@ -26,7 +26,7 @@ from homeassistant.const import (
from homeassistant.core import HomeAssistant
from homeassistant.helpers import entity_registry as er
from .conftest import MockConfigEntry, MockModuleConnection, init_integration
from .conftest import MockConfigEntry, MockDeviceConnection, init_integration
from tests.common import snapshot_platform
@@ -55,7 +55,7 @@ async def test_output_turn_on(hass: HomeAssistant, entry: MockConfigEntry) -> No
"""Test the output switch turns on."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "dim_output") as dim_output:
with patch.object(MockDeviceConnection, "dim_output") as dim_output:
# command failed
dim_output.return_value = False
@@ -92,7 +92,7 @@ async def test_output_turn_off(hass: HomeAssistant, entry: MockConfigEntry) -> N
"""Test the output switch turns off."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "dim_output") as dim_output:
with patch.object(MockDeviceConnection, "dim_output") as dim_output:
await hass.services.async_call(
DOMAIN_SWITCH,
SERVICE_TURN_ON,
@@ -136,7 +136,7 @@ async def test_relay_turn_on(hass: HomeAssistant, entry: MockConfigEntry) -> Non
"""Test the relay switch turns on."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "control_relays") as control_relays:
with patch.object(MockDeviceConnection, "control_relays") as control_relays:
states = [RelayStateModifier.NOCHANGE] * 8
states[0] = RelayStateModifier.ON
@@ -176,7 +176,7 @@ async def test_relay_turn_off(hass: HomeAssistant, entry: MockConfigEntry) -> No
"""Test the relay switch turns off."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "control_relays") as control_relays:
with patch.object(MockDeviceConnection, "control_relays") as control_relays:
states = [RelayStateModifier.NOCHANGE] * 8
states[0] = RelayStateModifier.OFF
@@ -225,7 +225,7 @@ async def test_regulatorlock_turn_on(
"""Test the regulator lock switch turns on."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "lock_regulator") as lock_regulator:
with patch.object(MockDeviceConnection, "lock_regulator") as lock_regulator:
# command failed
lock_regulator.return_value = False
@@ -264,7 +264,7 @@ async def test_regulatorlock_turn_off(
"""Test the regulator lock switch turns off."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "lock_regulator") as lock_regulator:
with patch.object(MockDeviceConnection, "lock_regulator") as lock_regulator:
await hass.services.async_call(
DOMAIN_SWITCH,
SERVICE_TURN_ON,
@@ -308,7 +308,7 @@ async def test_keylock_turn_on(hass: HomeAssistant, entry: MockConfigEntry) -> N
"""Test the keylock switch turns on."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "lock_keys") as lock_keys:
with patch.object(MockDeviceConnection, "lock_keys") as lock_keys:
states = [KeyLockStateModifier.NOCHANGE] * 8
states[0] = KeyLockStateModifier.ON
@@ -348,7 +348,7 @@ async def test_keylock_turn_off(hass: HomeAssistant, entry: MockConfigEntry) ->
"""Test the keylock switch turns off."""
await init_integration(hass, entry)
with patch.object(MockModuleConnection, "lock_keys") as lock_keys:
with patch.object(MockDeviceConnection, "lock_keys") as lock_keys:
states = [KeyLockStateModifier.NOCHANGE] * 8
states[0] = KeyLockStateModifier.OFF

2
tests/components/lcn/test_websocket.py
View File

@@ -118,7 +118,7 @@ async def test_lcn_devices_scan_command(
"""Test lcn/devices/scan command."""
# add new module which is not stored in config_entry
lcn_connection = await init_integration(hass, entry)
lcn_connection.get_address_conn(LcnAddr(0, 10, False))
lcn_connection.get_device_connection(LcnAddr(0, 10, False))
client = await hass_ws_client(hass)
await client.send_json_auto_id({**SCAN_PAYLOAD, "entry_id": entry.entry_id})