From d2baecb3418c4f95ffd1cdc1d4021f881098813a Mon Sep 17 00:00:00 2001 From: Bram Date: Fri, 31 Jan 2025 17:19:54 +0100 Subject: [PATCH 1/2] fix: register entity services only once --- custom_components/powercalc/sensor.py | 4 ++-- tests/config_flow/test_virtual_power_playbook.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/custom_components/powercalc/sensor.py b/custom_components/powercalc/sensor.py index 0131072c4..67cceaa3c 100644 --- a/custom_components/powercalc/sensor.py +++ b/custom_components/powercalc/sensor.py @@ -287,6 +287,8 @@ async def async_setup_platform( if CONF_CREATE_GROUP in config: config[CONF_NAME] = config[CONF_CREATE_GROUP] + register_entity_services() + await _async_setup_entities( hass, config, @@ -336,8 +338,6 @@ async def _async_setup_entities( config_entry: ConfigEntry | None = None, ) -> None: """Main routine to setup power/energy sensors from provided configuration.""" - register_entity_services() - try: entities = await create_sensors(hass, config, config_entry) if config_entry: diff --git a/tests/config_flow/test_virtual_power_playbook.py b/tests/config_flow/test_virtual_power_playbook.py index e4c0f9645..8caeb8d01 100644 --- a/tests/config_flow/test_virtual_power_playbook.py +++ b/tests/config_flow/test_virtual_power_playbook.py @@ -16,7 +16,7 @@ CalculationStrategy, SensorType, ) -from tests.common import get_test_config_dir +from tests.common import get_test_config_dir, run_powercalc_setup from tests.config_flow.common import ( assert_default_virtual_power_entry_data, create_mock_entry, @@ -138,6 +138,8 @@ async def test_state_trigger(hass: HomeAssistant) -> None: }, ) + await run_powercalc_setup(hass, {}) + hass.states.async_set("media_player.test", STATE_IDLE) await hass.async_block_till_done() From 0caf4acee1df50d43d92bc4d061515b2bd890cb7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2025 16:20:18 +0000 Subject: [PATCH 2/2] chore(lint): [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- profile_library/tuya/TYC-300mm-Z/model.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profile_library/tuya/TYC-300mm-Z/model.json b/profile_library/tuya/TYC-300mm-Z/model.json index a89317ff5..ad5691f86 100644 --- a/profile_library/tuya/TYC-300mm-Z/model.json +++ b/profile_library/tuya/TYC-300mm-Z/model.json @@ -12,4 +12,4 @@ "name": "Tuya Zigbee 3.0 Ceiling Lamp RGB+CW+WW 24W", "standby_power": 0.36, "author": "Dr-Seltsam <46630992+Dr-Seltsam@users.noreply.github.com>" -} \ No newline at end of file +}