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

Improve editing of device triggers referencing non-added alarm (#51701)

Browse Source
This commit is contained in:
Erik Montnemery 2021-06-13 00:07:25 +02:00 committed by GitHub
parent 3a739563b4
commit f9e9202e2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
homeassistant/components/alarm_control_panel/device_trigger.py
View File

@ -14,7 +14,6 @@ from homeassistant.components.automation import AutomationActionType
from homeassistant.components.device_automation import DEVICE_TRIGGER_BASE_SCHEMA from homeassistant.components.device_automation import DEVICE_TRIGGER_BASE_SCHEMA
from homeassistant.components.homeassistant.triggers import state as state_trigger from homeassistant.components.homeassistant.triggers import state as state_trigger
from homeassistant.const import ( from homeassistant.const import (
ATTR_SUPPORTED_FEATURES,
CONF_DEVICE_ID, CONF_DEVICE_ID,
CONF_DOMAIN, CONF_DOMAIN,
CONF_ENTITY_ID, CONF_ENTITY_ID,
@ -30,6 +29,7 @@ from homeassistant.const import (
) )
from homeassistant.core import CALLBACK_TYPE, HomeAssistant from homeassistant.core import CALLBACK_TYPE, HomeAssistant
from homeassistant.helpers import config_validation as cv, entity_registry from homeassistant.helpers import config_validation as cv, entity_registry
from homeassistant.helpers.entity import get_supported_features
from homeassistant.helpers.typing import ConfigType from homeassistant.helpers.typing import ConfigType
from . import DOMAIN from . import DOMAIN
@ -62,13 +62,7 @@ async def async_get_triggers(
if entry.domain != DOMAIN: if entry.domain != DOMAIN:
continue continue
entity_state = hass.states.get(entry.entity_id) supported_features = get_supported_features(hass, entry.entity_id)
# We need a state or else we can't populate the HVAC and preset modes.
if entity_state is None:
continue
supported_features = entity_state.attributes[ATTR_SUPPORTED_FEATURES]
# Add triggers for each entity that belongs to this integration # Add triggers for each entity that belongs to this integration
base_trigger = { base_trigger = {

102
tests/components/alarm_control_panel/test_device_trigger.py
View File

@ -48,7 +48,48 @@ def calls(hass):
return async_mock_service(hass, "test", "automation") return async_mock_service(hass, "test", "automation")
async def test_get_triggers(hass, device_reg, entity_reg): @pytest.mark.parametrize(
"set_state,features_reg,features_state,expected_trigger_types",
[
(False, 0, 0, ["triggered", "disarmed", "arming"]),
(
False,
15,
0,
[
"triggered",
"disarmed",
"arming",
"armed_home",
"armed_away",
"armed_night",
],
),
(True, 0, 0, ["triggered", "disarmed", "arming"]),
(
True,
0,
15,
[
"triggered",
"disarmed",
"arming",
"armed_home",
"armed_away",
"armed_night",
],
),
],
)
async def test_get_triggers(
hass,
device_reg,
entity_reg,
set_state,
features_reg,
features_state,
expected_trigger_types,
):
"""Test we get the expected triggers from an alarm_control_panel.""" """Test we get the expected triggers from an alarm_control_panel."""
config_entry = MockConfigEntry(domain="test", data={}) config_entry = MockConfigEntry(domain="test", data={})
config_entry.add_to_hass(hass) config_entry.add_to_hass(hass)
@ -56,53 +97,30 @@ async def test_get_triggers(hass, device_reg, entity_reg):
config_entry_id=config_entry.entry_id, config_entry_id=config_entry.entry_id,
connections={(device_registry.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")}, connections={(device_registry.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
) )
entity_reg.async_get_or_create(DOMAIN, "test", "5678", device_id=device_entry.id) entity_reg.async_get_or_create(
hass.states.async_set( DOMAIN,
"alarm_control_panel.test_5678", "attributes", {"supported_features": 15} "test",
"5678",
device_id=device_entry.id,
supported_features=features_reg,
) )
expected_triggers = [ if set_state:
hass.states.async_set(
"alarm_control_panel.test_5678",
"attributes",
{"supported_features": features_state},
)
expected_triggers = []
expected_triggers += [
{ {
"platform": "device", "platform": "device",
"domain": DOMAIN, "domain": DOMAIN,
"type": "disarmed", "type": trigger,
"device_id": device_entry.id, "device_id": device_entry.id,
"entity_id": f"{DOMAIN}.test_5678", "entity_id": f"{DOMAIN}.test_5678",
}, }
{ for trigger in expected_trigger_types
"platform": "device",
"domain": DOMAIN,
"type": "triggered",
"device_id": device_entry.id,
"entity_id": f"{DOMAIN}.test_5678",
},
{
"platform": "device",
"domain": DOMAIN,
"type": "arming",
"device_id": device_entry.id,
"entity_id": f"{DOMAIN}.test_5678",
},
{
"platform": "device",
"domain": DOMAIN,
"type": "armed_home",
"device_id": device_entry.id,
"entity_id": f"{DOMAIN}.test_5678",
},
{
"platform": "device",
"domain": DOMAIN,
"type": "armed_away",
"device_id": device_entry.id,
"entity_id": f"{DOMAIN}.test_5678",
},
{
"platform": "device",
"domain": DOMAIN,
"type": "armed_night",
"device_id": device_entry.id,
"entity_id": f"{DOMAIN}.test_5678",
},
] ]
triggers = await async_get_device_automations(hass, "trigger", device_entry.id) triggers = await async_get_device_automations(hass, "trigger", device_entry.id)
assert_lists_same(triggers, expected_triggers) assert_lists_same(triggers, expected_triggers)