Catch the right nest stream refresh exception error (#43189)

pull/43212/head
Allen Porter 2020-11-13 22:37:09 -08:00 committed by GitHub
parent d7f1deeb00
commit 3e46c42307
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -4,10 +4,10 @@ import datetime
import logging
from typing import Optional
from aiohttp.client_exceptions import ClientError
from google_nest_sdm.camera_traits import CameraImageTrait, CameraLiveStreamTrait
from google_nest_sdm.device import Device
from haffmpeg.tools import IMAGE_JPEG
import requests
from homeassistant.components.camera import SUPPORT_STREAM, Camera
from homeassistant.components.ffmpeg import async_get_image
@ -130,7 +130,7 @@ class NestCamera(Camera):
self._stream_refresh_unsub = None
try:
self._stream = await self._stream.extend_rtsp_stream()
except requests.HTTPError as err:
except ClientError as err:
_LOGGER.debug("Failed to extend stream: %s", err)
# Next attempt to catch a url will get a new one
self._stream = None

View File

@ -8,9 +8,9 @@ pubsub subscriber.
import datetime
from typing import List
from aiohttp.client_exceptions import ClientConnectionError
from google_nest_sdm.auth import AbstractAuth
from google_nest_sdm.device import Device
from requests import HTTPError
from homeassistant.components import camera
from homeassistant.components.camera import STATE_IDLE
@ -315,8 +315,8 @@ async def test_refresh_expired_stream_failure(hass, aiohttp_client):
},
}
),
# Extending the stream fails
FakeResponse(error=HTTPError(response="Some Error")),
# Extending the stream fails with arbitrary error
FakeResponse(error=ClientConnectionError()),
# Next attempt to get a stream fetches a new url
FakeResponse(
{