jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-16 09:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix nest error handling and bug in tests for media fetches (#70596)

Browse Source
This commit is contained in:
Allen Porter 2022-04-24 13:17:59 -07:00 committed by GitHub
parent 31b6b3deb5
commit bab9f4ba76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/nest/__init__.py
View File

@ -278,10 +278,10 @@ class NestEventViewBase(HomeAssistantView, ABC):
) )
try: try:
media = await self.load_media(nest_device, event_token) media = await self.load_media(nest_device, event_token)
except DecodeException as err: except DecodeException:
raise HomeAssistantError( return self._json_error(
"Even token was invalid: %s" % event_token f"Event token was invalid '{event_token}'", HTTPStatus.NOT_FOUND
) from err )
except ApiException as err: except ApiException as err:
raise HomeAssistantError("Unable to fetch media for event") from err raise HomeAssistantError("Unable to fetch media for event") from err
if not media: if not media:

18
tests/components/nest/test_media_source.py
View File

@ -875,7 +875,7 @@ async def test_event_media_render_invalid_event_id(hass, auth, hass_client):
assert device.name == DEVICE_NAME assert device.name == DEVICE_NAME
client = await hass_client() client = await hass_client()
response = await client.get("/api/nest/event_media/{device.id}/invalid-event-id") response = await client.get(f"/api/nest/event_media/{device.id}/invalid-event-id")
assert response.status == HTTPStatus.NOT_FOUND, ( assert response.status == HTTPStatus.NOT_FOUND, (
"Response not matched: %s" % response "Response not matched: %s" % response
) )
@ -886,7 +886,9 @@ async def test_event_media_failure(hass, auth, hass_client):
subscriber = await async_setup_devices( subscriber = await async_setup_devices(
hass, auth, CAMERA_DEVICE_TYPE, CAMERA_TRAITS hass, auth, CAMERA_DEVICE_TYPE, CAMERA_TRAITS
) )
received_events = async_capture_events(hass, NEST_EVENT)
# Failure from server when fetching media
auth.responses = [ auth.responses = [
aiohttp.web.Response(status=HTTPStatus.INTERNAL_SERVER_ERROR), aiohttp.web.Response(status=HTTPStatus.INTERNAL_SERVER_ERROR),
] ]
@ -910,16 +912,24 @@ async def test_event_media_failure(hass, auth, hass_client):
assert device assert device
assert device.name == DEVICE_NAME assert device.name == DEVICE_NAME
# Verify events are published correctly
assert len(received_events) == 1
received_event = received_events[0]
assert received_event.data["device_id"] == device.id
assert received_event.data["type"] == "camera_person"
event_identifier = received_event.data["nest_event_id"]
# Resolving the event links to the media # Resolving the event links to the media
media = await media_source.async_resolve_media( media = await media_source.async_resolve_media(
hass, f"{const.URI_SCHEME}{DOMAIN}/{device.id}/{EVENT_SESSION_ID}" hass, f"{const.URI_SCHEME}{DOMAIN}/{device.id}/{event_identifier}"
) )
assert media.url == f"/api/nest/event_media/{device.id}/{EVENT_SESSION_ID}" assert media.url == f"/api/nest/event_media/{device.id}/{event_identifier}"
assert media.mime_type == "image/jpeg" assert media.mime_type == "image/jpeg"
# Media is not available to be fetched
client = await hass_client() client = await hass_client()
response = await client.get(media.url) response = await client.get(media.url)
assert response.status == HTTPStatus.INTERNAL_SERVER_ERROR, ( assert response.status == HTTPStatus.NOT_FOUND, (
"Response not matched: %s" % response "Response not matched: %s" % response
) )