Remaining DeviceAutomationType bits (#62508)

* Use DeviceAutomationType in missed tests/components/*

* Tighten device automation type hints
This commit is contained in:
Ville Skyttä 2021-12-21 20:05:48 +02:00 committed by GitHub
parent 498720f3c9
commit 9b437ef146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 29 additions and 27 deletions

View File

@ -228,7 +228,11 @@ async def _async_get_device_automations(
return combined_results
async def _async_get_device_automation_capabilities(hass, automation_type, automation):
async def _async_get_device_automation_capabilities(
hass: HomeAssistant,
automation_type: DeviceAutomationType,
automation: Mapping[str, Any],
) -> dict[str, Any]:
"""List device automations."""
try:
platform = await async_get_device_automation_platform(
@ -237,8 +241,6 @@ async def _async_get_device_automation_capabilities(hass, automation_type, autom
except InvalidDeviceAutomationConfig:
return {}
if isinstance(automation_type, str): # until tests pass DeviceAutomationType
automation_type = DeviceAutomationType[automation_type.upper()]
function_name = automation_type.value.get_capabilities_func
if not hasattr(platform, function_name):
@ -259,7 +261,7 @@ async def _async_get_device_automation_capabilities(hass, automation_type, autom
extra_fields, custom_serializer=cv.custom_serializer
)
return capabilities
return capabilities # type: ignore[no-any-return]
def handle_device_errors(func):

View File

@ -70,7 +70,7 @@ CLIENT_REDIRECT_URI = "https://example.com/app/callback"
async def async_get_device_automations(
hass: HomeAssistant,
automation_type: device_automation.DeviceAutomationType | str,
automation_type: device_automation.DeviceAutomationType,
device_id: str,
) -> Any:
"""Get a device automation for a single device id."""

View File

@ -170,7 +170,7 @@ async def test_get_action_capabilities(
assert {action["type"] for action in actions} == set(expected_capabilities)
for action in actions:
capabilities = await async_get_device_automation_capabilities(
hass, "action", action
hass, DeviceAutomationType.ACTION, action
)
assert capabilities == expected_capabilities[action["type"]]
@ -222,7 +222,7 @@ async def test_get_action_capabilities_arm_code(
assert {action["type"] for action in actions} == set(expected_capabilities)
for action in actions:
capabilities = await async_get_device_automation_capabilities(
hass, "action", action
hass, DeviceAutomationType.ACTION, action
)
assert capabilities == expected_capabilities[action["type"]]

View File

@ -151,7 +151,7 @@ async def test_get_trigger_capabilities(hass, device_reg, entity_reg):
assert len(triggers) == 6
for trigger in triggers:
capabilities = await async_get_device_automation_capabilities(
hass, "trigger", trigger
hass, DeviceAutomationType.TRIGGER, trigger
)
assert capabilities == {
"extra_fields": [

View File

@ -137,7 +137,7 @@ async def test_get_condition_capabilities(hass, device_reg, entity_reg):
)
for condition in conditions:
capabilities = await async_get_device_automation_capabilities(
hass, "condition", condition
hass, DeviceAutomationType.CONDITION, condition
)
assert capabilities == expected_capabilities

View File

@ -140,7 +140,7 @@ async def test_get_trigger_capabilities(hass, device_reg, entity_reg):
)
for trigger in triggers:
capabilities = await async_get_device_automation_capabilities(
hass, "trigger", trigger
hass, DeviceAutomationType.TRIGGER, trigger
)
assert capabilities == expected_capabilities

View File

@ -151,7 +151,7 @@ async def test_get_action_capabilities(
assert action_types == {"open", "close", "stop", "open_tilt", "close_tilt"}
for action in actions:
capabilities = await async_get_device_automation_capabilities(
hass, "action", action
hass, DeviceAutomationType.ACTION, action
)
assert capabilities == {"extra_fields": []}
@ -197,7 +197,7 @@ async def test_get_action_capabilities_set_pos(
assert action_types == {"set_position"}
for action in actions:
capabilities = await async_get_device_automation_capabilities(
hass, "action", action
hass, DeviceAutomationType.ACTION, action
)
if action["type"] == "set_position":
assert capabilities == expected_capabilities
@ -246,7 +246,7 @@ async def test_get_action_capabilities_set_tilt_pos(
assert action_types == {"open", "close", "set_tilt_position"}
for action in actions:
capabilities = await async_get_device_automation_capabilities(
hass, "action", action
hass, DeviceAutomationType.ACTION, action
)
if action["type"] == "set_tilt_position":
assert capabilities == expected_capabilities

View File

@ -138,7 +138,7 @@ async def test_get_condition_capabilities(
assert len(conditions) == 4
for condition in conditions:
capabilities = await async_get_device_automation_capabilities(
hass, "condition", condition
hass, DeviceAutomationType.CONDITION, condition
)
assert capabilities == {"extra_fields": []}
@ -189,7 +189,7 @@ async def test_get_condition_capabilities_set_pos(
assert len(conditions) == 5
for condition in conditions:
capabilities = await async_get_device_automation_capabilities(
hass, "condition", condition
hass, DeviceAutomationType.CONDITION, condition
)
if condition["type"] == "is_position":
assert capabilities == expected_capabilities
@ -243,7 +243,7 @@ async def test_get_condition_capabilities_set_tilt_pos(
assert len(conditions) == 5
for condition in conditions:
capabilities = await async_get_device_automation_capabilities(
hass, "condition", condition
hass, DeviceAutomationType.CONDITION, condition
)
if condition["type"] == "is_tilt_position":
assert capabilities == expected_capabilities

View File

@ -158,7 +158,7 @@ async def test_get_trigger_capabilities(
assert len(triggers) == 4
for trigger in triggers:
capabilities = await async_get_device_automation_capabilities(
hass, "trigger", trigger
hass, DeviceAutomationType.TRIGGER, trigger
)
assert capabilities == {
"extra_fields": [
@ -213,7 +213,7 @@ async def test_get_trigger_capabilities_set_pos(
assert len(triggers) == 5
for trigger in triggers:
capabilities = await async_get_device_automation_capabilities(
hass, "trigger", trigger
hass, DeviceAutomationType.TRIGGER, trigger
)
if trigger["type"] == "position":
assert capabilities == expected_capabilities
@ -275,7 +275,7 @@ async def test_get_trigger_capabilities_set_tilt_pos(
assert len(triggers) == 5
for trigger in triggers:
capabilities = await async_get_device_automation_capabilities(
hass, "trigger", trigger
hass, DeviceAutomationType.TRIGGER, trigger
)
if trigger["type"] == "tilt_position":
assert capabilities == expected_capabilities

View File

@ -92,7 +92,7 @@ async def test_get_trigger_capabilities(hass, device_reg, entity_reg):
)
for trigger in triggers:
capabilities = await async_get_device_automation_capabilities(
hass, "trigger", trigger
hass, DeviceAutomationType.TRIGGER, trigger
)
assert capabilities == expected_capabilities

View File

@ -127,7 +127,7 @@ async def test_get_action_capabilities(hass, device_reg, entity_reg):
assert action_types == {"turn_on", "toggle", "turn_off"}
for action in actions:
capabilities = await async_get_device_automation_capabilities(
hass, "action", action
hass, DeviceAutomationType.ACTION, action
)
assert capabilities == {"extra_fields": []}
@ -135,7 +135,7 @@ async def test_get_action_capabilities(hass, device_reg, entity_reg):
entity_reg.async_remove(entity_id)
for action in actions:
capabilities = await async_get_device_automation_capabilities(
hass, "action", action
hass, DeviceAutomationType.ACTION, action
)
assert capabilities == {"extra_fields": []}
@ -273,7 +273,7 @@ async def test_get_action_capabilities_features(
assert action_types == expected_actions
for action in actions:
capabilities = await async_get_device_automation_capabilities(
hass, "action", action
hass, DeviceAutomationType.ACTION, action
)
expected = {"extra_fields": expected_capabilities.get(action["type"], [])}
assert capabilities == expected

View File

@ -91,7 +91,7 @@ async def test_get_condition_capabilities(hass, device_reg, entity_reg):
)
for condition in conditions:
capabilities = await async_get_device_automation_capabilities(
hass, "condition", condition
hass, DeviceAutomationType.CONDITION, condition
)
assert capabilities == expected_capabilities

View File

@ -91,7 +91,7 @@ async def test_get_trigger_capabilities(hass, device_reg, entity_reg):
)
for trigger in triggers:
capabilities = await async_get_device_automation_capabilities(
hass, "trigger", trigger
hass, DeviceAutomationType.TRIGGER, trigger
)
assert capabilities == expected_capabilities

View File

@ -116,7 +116,7 @@ async def test_get_trigger_capabilities(hass, device_reg, entity_reg):
assert len(triggers) == 5
for trigger in triggers:
capabilities = await async_get_device_automation_capabilities(
hass, "trigger", trigger
hass, DeviceAutomationType.TRIGGER, trigger
)
assert capabilities == {
"extra_fields": [

View File

@ -91,7 +91,7 @@ async def test_get_trigger_capabilities(hass, device_reg, entity_reg):
assert len(triggers) == 5
for trigger in triggers:
capabilities = await async_get_device_automation_capabilities(
hass, "trigger", trigger
hass, DeviceAutomationType.TRIGGER, trigger
)
assert capabilities == {
"extra_fields": [