Skip to content

Prosegur late review comments #88859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartinHjelmare merged 3 commits into from
Feb 28, 2023
Merged

Prosegur late review comments #88859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71b71a5
address late comments on #76428
dgomes Feb 27, 2023
073ccf2
adress review
dgomes Feb 27, 2023
36d8cd1
extra tweaks
dgomes Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions homeassistant/components/prosegur/camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ async def async_camera_image(
) -> bytes | None:
"""Return bytes of camera image."""

_LOGGER.debug("Get image for %s", self._camera.description)
Comment thread
MartinHjelmare marked this conversation as resolved.
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:
Expand All @@ -85,8 +85,8 @@ async def async_camera_image(
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:
Expand Down
9 changes: 6 additions & 3 deletions tests/components/prosegur/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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()

Expand All @@ -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()

Expand Down
13 changes: 6 additions & 7 deletions tests/components/prosegur/test_camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down