mirror of
https://github.com/home-assistant/core.git
synced 2025-04-26 10:17:51 +00:00
Fix generic camera typo in attr_frame_interval (#65390)
This commit is contained in:
parent
716a1e2a64
commit
5ebc02cef6
@ -96,7 +96,7 @@ class GenericCamera(Camera):
|
|||||||
if self._stream_source is not None:
|
if self._stream_source is not None:
|
||||||
self._stream_source.hass = hass
|
self._stream_source.hass = hass
|
||||||
self._limit_refetch = device_info[CONF_LIMIT_REFETCH_TO_URL_CHANGE]
|
self._limit_refetch = device_info[CONF_LIMIT_REFETCH_TO_URL_CHANGE]
|
||||||
self._attr_frames_interval = 1 / device_info[CONF_FRAMERATE]
|
self._attr_frame_interval = 1 / device_info[CONF_FRAMERATE]
|
||||||
self._supported_features = SUPPORT_STREAM if self._stream_source else 0
|
self._supported_features = SUPPORT_STREAM if self._stream_source else 0
|
||||||
self.content_type = device_info[CONF_CONTENT_TYPE]
|
self.content_type = device_info[CONF_CONTENT_TYPE]
|
||||||
self.verify_ssl = device_info[CONF_VERIFY_SSL]
|
self.verify_ssl = device_info[CONF_VERIFY_SSL]
|
||||||
|
@ -9,6 +9,7 @@ import pytest
|
|||||||
import respx
|
import respx
|
||||||
|
|
||||||
from homeassistant import config as hass_config
|
from homeassistant import config as hass_config
|
||||||
|
from homeassistant.components.camera import async_get_mjpeg_stream
|
||||||
from homeassistant.components.generic import DOMAIN
|
from homeassistant.components.generic import DOMAIN
|
||||||
from homeassistant.components.websocket_api.const import TYPE_RESULT
|
from homeassistant.components.websocket_api.const import TYPE_RESULT
|
||||||
from homeassistant.const import SERVICE_RELOAD
|
from homeassistant.const import SERVICE_RELOAD
|
||||||
@ -515,3 +516,29 @@ async def test_no_still_image_url(hass, hass_client):
|
|||||||
mock_stream.async_get_image.assert_called_once()
|
mock_stream.async_get_image.assert_called_once()
|
||||||
assert resp.status == HTTPStatus.OK
|
assert resp.status == HTTPStatus.OK
|
||||||
assert await resp.read() == b"stream_keyframe_image"
|
assert await resp.read() == b"stream_keyframe_image"
|
||||||
|
|
||||||
|
|
||||||
|
async def test_frame_interval_property(hass):
|
||||||
|
"""Test that the frame interval is calculated and returned correctly."""
|
||||||
|
|
||||||
|
await async_setup_component(
|
||||||
|
hass,
|
||||||
|
"camera",
|
||||||
|
{
|
||||||
|
"camera": {
|
||||||
|
"name": "config_test",
|
||||||
|
"platform": "generic",
|
||||||
|
"stream_source": "rtsp://example.com:554/rtsp/",
|
||||||
|
"framerate": 5,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
await hass.async_block_till_done()
|
||||||
|
|
||||||
|
request = Mock()
|
||||||
|
with patch(
|
||||||
|
"homeassistant.components.camera.async_get_still_stream"
|
||||||
|
) as mock_get_stream:
|
||||||
|
await async_get_mjpeg_stream(hass, request, "camera.config_test")
|
||||||
|
|
||||||
|
assert mock_get_stream.call_args_list[0][0][3] == pytest.approx(0.2)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user