jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-29 11:47:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address late review of motionEye services (#58924)

Browse Source
This commit is contained in:
Dermot Duffy 2021-11-02 05:33:08 -07:00 committed by GitHub
parent bfb0d8dd19
commit 4746ff3798
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
homeassistant/components/motioneye/camera.py
View File

@ -77,12 +77,14 @@ SCHEMA_TEXT_OVERLAY = vol.In(
) )
SCHEMA_SERVICE_SET_TEXT = vol.Schema( SCHEMA_SERVICE_SET_TEXT = vol.Schema(
vol.All( vol.All(
{ cv.make_entity_service_schema(
vol.Optional(KEY_TEXT_OVERLAY_LEFT): SCHEMA_TEXT_OVERLAY, {
vol.Optional(KEY_TEXT_OVERLAY_CUSTOM_TEXT_LEFT): cv.string, vol.Optional(KEY_TEXT_OVERLAY_LEFT): SCHEMA_TEXT_OVERLAY,
vol.Optional(KEY_TEXT_OVERLAY_RIGHT): SCHEMA_TEXT_OVERLAY, vol.Optional(KEY_TEXT_OVERLAY_CUSTOM_TEXT_LEFT): cv.string,
vol.Optional(KEY_TEXT_OVERLAY_CUSTOM_TEXT_RIGHT): cv.string, vol.Optional(KEY_TEXT_OVERLAY_RIGHT): SCHEMA_TEXT_OVERLAY,
}, vol.Optional(KEY_TEXT_OVERLAY_CUSTOM_TEXT_RIGHT): cv.string,
},
),
cv.has_at_least_one_key( cv.has_at_least_one_key(
KEY_TEXT_OVERLAY_LEFT, KEY_TEXT_OVERLAY_LEFT,
KEY_TEXT_OVERLAY_CUSTOM_TEXT_LEFT, KEY_TEXT_OVERLAY_CUSTOM_TEXT_LEFT,
@ -90,7 +92,6 @@ SCHEMA_SERVICE_SET_TEXT = vol.Schema(
KEY_TEXT_OVERLAY_CUSTOM_TEXT_RIGHT, KEY_TEXT_OVERLAY_CUSTOM_TEXT_RIGHT,
), ),
), ),
extra=vol.ALLOW_EXTRA,
) )

6
tests/components/motioneye/test_camera.py
View File

@ -414,9 +414,9 @@ async def test_set_text_overlay_bad_entity_identifier(hass: HomeAssistant) -> No
} }
client.reset_mock() client.reset_mock()
await hass.services.async_call(DOMAIN, SERVICE_SET_TEXT_OVERLAY, data) with pytest.raises(vol.error.MultipleInvalid):
await hass.async_block_till_done() await hass.services.async_call(DOMAIN, SERVICE_SET_TEXT_OVERLAY, data)
assert not client.async_set_camera.called await hass.async_block_till_done()
async def test_set_text_overlay_bad_empty(hass: HomeAssistant) -> None: async def test_set_text_overlay_bad_empty(hass: HomeAssistant) -> None: