Prosegur late review comments (#88859)
* address late comments on #76428 * adress review * extra tweaks
This commit is contained in:
parent
7b3cab1bfe
commit
07c25b3dd8
3 changed files with 14 additions and 12 deletions
|
@ -73,8 +73,8 @@ class ProsegurCamera(Camera):
|
|||
) -> bytes | None:
|
||||
"""Return bytes of camera image."""
|
||||
|
||||
_LOGGER.debug("Get image for %s", self._camera.description)
|
||||
try:
|
||||
_LOGGER.debug("Get image for %s", self._camera.description)
|
||||
return await self._installation.get_image(self._auth, self._camera.id)
|
||||
|
||||
except ProsegurException as err:
|
||||
|
@ -85,8 +85,8 @@ class ProsegurCamera(Camera):
|
|||
async def async_request_image(self):
|
||||
"""Request new image from the camera."""
|
||||
|
||||
_LOGGER.debug("Request image for %s", self._camera.description)
|
||||
try:
|
||||
_LOGGER.debug("Request image for %s", self._camera.description)
|
||||
await self._installation.request_image(self._auth, self._camera.id)
|
||||
|
||||
except ProsegurException as err:
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
"""Define test fixtures for Prosegur."""
|
||||
from unittest.mock import AsyncMock, patch
|
||||
from unittest.mock import AsyncMock, MagicMock, patch
|
||||
|
||||
from pyprosegur.installation import Camera
|
||||
import pytest
|
||||
|
@ -30,9 +30,12 @@ def mock_config_entry() -> MockConfigEntry:
|
|||
@pytest.fixture
|
||||
def mock_install() -> AsyncMock:
|
||||
"""Return the mocked alarm install."""
|
||||
install = AsyncMock()
|
||||
install = MagicMock()
|
||||
install.contract = CONTRACT
|
||||
install.cameras = [Camera("1", "test_cam")]
|
||||
install.arm = AsyncMock()
|
||||
install.disarm = AsyncMock()
|
||||
install.arm_partially = AsyncMock()
|
||||
install.get_image = AsyncMock(return_value=b"ABC")
|
||||
install.request_image = AsyncMock()
|
||||
|
||||
|
@ -51,7 +54,7 @@ async def init_integration(
|
|||
|
||||
with patch(
|
||||
"pyprosegur.installation.Installation.retrieve", return_value=mock_install
|
||||
), patch("pyprosegur.auth.Auth.login", return_value=AsyncMock()):
|
||||
), patch("pyprosegur.auth.Auth.login"):
|
||||
await hass.config_entries.async_setup(mock_config_entry.entry_id)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
|
|
|
@ -27,13 +27,12 @@ async def test_camera_fail(hass, init_integration, mock_install, caplog):
|
|||
return_value=b"ABC", side_effect=ProsegurException()
|
||||
)
|
||||
|
||||
with caplog.at_level(logging.ERROR, logger="homeassistant.components.prosegur"):
|
||||
try:
|
||||
await camera.async_get_image(hass, "camera.test_cam")
|
||||
except HomeAssistantError as exc:
|
||||
assert str(exc) == "Unable to get image"
|
||||
else:
|
||||
assert pytest.fail()
|
||||
with caplog.at_level(
|
||||
logging.ERROR, logger="homeassistant.components.prosegur"
|
||||
), pytest.raises(HomeAssistantError) as exc:
|
||||
await camera.async_get_image(hass, "camera.test_cam")
|
||||
|
||||
assert "Unable to get image" in str(exc.value)
|
||||
|
||||
assert "Image test_cam doesn't exist" in caplog.text
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue