From 85ec6c474980ec8d606b3e37c93624988d4fd21e Mon Sep 17 00:00:00 2001 From: Luke Fritz Date: Sun, 1 Jul 2018 17:00:38 -0500 Subject: [PATCH 1/2] Fix issue where ambient sensor data is never updated --- pyarlo/base_station.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pyarlo/base_station.py b/pyarlo/base_station.py index 4436698..f2b461c 100644 --- a/pyarlo/base_station.py +++ b/pyarlo/base_station.py @@ -684,6 +684,7 @@ def update(self): if current_time >= (last_refresh + self._refresh_rate): self.get_cameras_properties() + self.get_ambient_sensor_data() self._attrs = self._session.refresh_attributes(self.name) self._attrs = assert_is_dict(self._attrs) _LOGGER.debug("Called base station update of camera properties: " From f7a7e1ed1ed05f3997d66940a5bdfde1faa5f18b Mon Sep 17 00:00:00 2001 From: Luke Fritz Date: Sun, 1 Jul 2018 17:18:38 -0500 Subject: [PATCH 2/2] Fix tests --- tests/test_base_station.py | 1 + tests/test_camera.py | 3 ++- tests/test_modes.py | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/test_base_station.py b/tests/test_base_station.py index 0b2b0b0..05da763 100644 --- a/tests/test_base_station.py +++ b/tests/test_base_station.py @@ -83,6 +83,7 @@ def test_get_properties(self, mock): @requests_mock.Mocker() @patch.object(ArloBaseStation, "publish_and_get_event", load_camera_props) + @patch.object(ArloBaseStation, "get_ambient_sensor_data", MagicMock()) def test_camera_properties(self, mock): """Test ArloBaseStation.get_cameras_properties.""" base = self.load_base_station(mock) diff --git a/tests/test_camera.py b/tests/test_camera.py index 277b86c..40feaa3 100644 --- a/tests/test_camera.py +++ b/tests/test_camera.py @@ -11,7 +11,7 @@ open_fixture ) -from mock import patch +from mock import patch, MagicMock from pyarlo import PyArlo, ArloBaseStation from pyarlo.camera import ArloCamera from pyarlo.const import ( @@ -43,6 +43,7 @@ def load_arlo(self, mock): @requests_mock.Mocker() @patch.object(ArloBaseStation, "publish_and_get_event", load_camera_props) + @patch.object(ArloBaseStation, "get_ambient_sensor_data", MagicMock()) def test_camera_properties(self, mock): """Test ArloCamera properties.""" arlo = self.load_arlo(mock) diff --git a/tests/test_modes.py b/tests/test_modes.py index e3ce5ba..b12d4ac 100644 --- a/tests/test_modes.py +++ b/tests/test_modes.py @@ -1,7 +1,7 @@ """The tests for the PyArlo platform.""" import unittest from functools import partial -from mock import patch +from mock import patch, MagicMock from pyarlo import ArloBaseStation, PyArlo from tests.common import load_fixture, load_camera_schedule @@ -84,6 +84,7 @@ def test_available_modes(self, mock): @requests_mock.Mocker() @patch.object(ArloBaseStation, "publish_and_get_event", load_modes) + @patch.object(ArloBaseStation, "get_ambient_sensor_data", MagicMock()) def test_set_mode(self, mock): """Test PyArlo BaseStation.mode property.""" notify_url = NOTIFY_ENDPOINT.format("48b14cbbbbbbb") @@ -108,6 +109,7 @@ def test_set_mode(self, mock): @requests_mock.Mocker() @patch.object(ArloBaseStation, "publish_and_get_event", partial(load_camera_schedule, active=True)) + @patch.object(ArloBaseStation, "get_ambient_sensor_data", MagicMock) def test_set_schedule_mode(self, mock): """Test PyArlo BaseStation.mode property.""" notify_url = NOTIFY_ENDPOINT.format("48b14cbbbbbbb")