From 3e46c42307b3ea18a5254b58f8ab1a8a805913bb Mon Sep 17 00:00:00 2001 From: Allen Porter Date: Fri, 13 Nov 2020 22:37:09 -0800 Subject: [PATCH] Catch the right nest stream refresh exception error (#43189) --- homeassistant/components/nest/camera_sdm.py | 4 ++-- tests/components/nest/camera_sdm_test.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/homeassistant/components/nest/camera_sdm.py b/homeassistant/components/nest/camera_sdm.py index ad4293fde5d..a8c5c86c4e8 100644 --- a/homeassistant/components/nest/camera_sdm.py +++ b/homeassistant/components/nest/camera_sdm.py @@ -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 diff --git a/tests/components/nest/camera_sdm_test.py b/tests/components/nest/camera_sdm_test.py index 40972d04351..e3397129ec9 100644 --- a/tests/components/nest/camera_sdm_test.py +++ b/tests/components/nest/camera_sdm_test.py @@ -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( {