evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
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(
vol.All(
{
vol.Optional(KEY_TEXT_OVERLAY_LEFT): SCHEMA_TEXT_OVERLAY,
vol.Optional(KEY_TEXT_OVERLAY_CUSTOM_TEXT_LEFT): cv.string,
vol.Optional(KEY_TEXT_OVERLAY_RIGHT): SCHEMA_TEXT_OVERLAY,
vol.Optional(KEY_TEXT_OVERLAY_CUSTOM_TEXT_RIGHT): cv.string,
},
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_RIGHT): SCHEMA_TEXT_OVERLAY,
vol.Optional(KEY_TEXT_OVERLAY_CUSTOM_TEXT_RIGHT): cv.string,
},
),
cv.has_at_least_one_key(
KEY_TEXT_OVERLAY_LEFT,
KEY_TEXT_OVERLAY_CUSTOM_TEXT_LEFT,
@ -90,7 +92,6 @@ SCHEMA_SERVICE_SET_TEXT = vol.Schema(
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()
await hass.services.async_call(DOMAIN, SERVICE_SET_TEXT_OVERLAY, data)
await hass.async_block_till_done()
assert not client.async_set_camera.called
with pytest.raises(vol.error.MultipleInvalid):
await hass.services.async_call(DOMAIN, SERVICE_SET_TEXT_OVERLAY, data)
await hass.async_block_till_done()
async def test_set_text_overlay_bad_empty(hass: HomeAssistant) -> None: