PyPlumIO 0.5.54__tar.gz → 0.5.55__tar.gz

{pyplumio-0.5.54 → pyplumio-0.5.55}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPlumIO
-Version: 0.5.54
+Version: 0.5.55
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License

{pyplumio-0.5.54 → pyplumio-0.5.55}/PyPlumIO.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPlumIO
-Version: 0.5.54
+Version: 0.5.55
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License

{pyplumio-0.5.54 → pyplumio-0.5.55}/pyplumio/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.5.54'
-__version_tuple__ = version_tuple = (0, 5, 54)
+__version__ = version = '0.5.55'
+__version_tuple__ = version_tuple = (0, 5, 55)
 
-__commit_id__ = commit_id = 'g7b7ef864f'
+__commit_id__ = commit_id = 'gb0f1bcbdf'

{pyplumio-0.5.54 → pyplumio-0.5.55}/pyplumio/devices/ecomax.py

@@ -139,6 +139,8 @@ REQUIRED: tuple[DataFrameDescription, ...] = (
 
 REQUIRED_TYPES = [description.frame_type for description in REQUIRED]
 
+SETUP_TIMEOUT: Final = 60.0
+
 
 class EcoMAX(PhysicalDevice):
     """Represents an ecoMAX controller."""
@@ -233,10 +235,19 @@ class EcoMAX(PhysicalDevice):
         await super().shutdown()
 
     @event_listener
-    async def on_event_setup(self, setup: bool) -> None:
+    async def on_event_setup(self, setup: bool) -> bool:
         """Request frames required to set up an ecoMAX entry."""
         _LOGGER.debug("Setting up device entry")
-        await self.wait_for(ATTR_SENSORS, timeout=30.0)
+
+        try:
+            await self.wait_for(ATTR_SENSORS, timeout=SETUP_TIMEOUT)
+        except asyncio.TimeoutError:
+            _LOGGER.error(
+                "Could not setup device entry; no response from device for %u seconds",
+                SETUP_TIMEOUT,
+            )
+            return False
+
         results = await asyncio.gather(
             *(
                 self.request(description.provides, description.frame_type)
@@ -253,6 +264,7 @@ class EcoMAX(PhysicalDevice):
             self.dispatch_nowait(ATTR_FRAME_ERRORS, errors)
 
         _LOGGER.debug("Device entry setup done")
+        return True
 
     @event_listener
     async def on_event_ecomax_parameters(

{pyplumio-0.5.54 → pyplumio-0.5.55}/tests/devices/test_ecomax.py

@@ -1,5 +1,6 @@
 """Contains tests for the ecoMAX device."""
 
+import asyncio
 from datetime import timedelta
 import logging
 from typing import Any, cast
@@ -206,7 +207,20 @@ async def test_ecomax_setup(mock_wait_for, mock_request, ecomax: EcoMAX) -> None
     await ecomax.wait_until_done()
     assert ATTR_FRAME_ERRORS not in ecomax.data
     assert mock_request.await_count == len(REQUIRED)
-    mock_wait_for.assert_awaited_once_with(ATTR_SENSORS, timeout=30.0)
+    mock_wait_for.assert_awaited_once_with(ATTR_SENSORS, timeout=60.0)
+
+
+@patch("pyplumio.devices.ecomax.EcoMAX.request")
+@patch("pyplumio.devices.ecomax.EcoMAX.wait_for", side_effect=(asyncio.TimeoutError,))
+async def test_ecomax_setup_failed(
+    mock_wait_for, mock_request, ecomax: EcoMAX, caplog
+) -> None:
+    """Test setting up an ecoMAX entry with failure due to timeout."""
+    ecomax.dispatch_nowait(ATTR_SETUP, True)
+    await ecomax.wait_until_done()
+    assert ecomax.get_nowait(ATTR_SETUP) is False
+    assert "Could not setup device entry" in caplog.text
+    assert "no response from device for 60 seconds" in caplog.text
 
 
 @patch(
@@ -220,7 +234,7 @@ async def test_ecomax_setup_errors(mock_wait_for, mock_request, ecomax: EcoMAX)
     await ecomax.wait_until_done()
     assert FrameType.REQUEST_ALERTS in ecomax.get_nowait(ATTR_FRAME_ERRORS, [])
     assert mock_request.await_count == len(REQUIRED)
-    mock_wait_for.assert_awaited_once_with(ATTR_SENSORS, timeout=30.0)
+    mock_wait_for.assert_awaited_once_with(ATTR_SENSORS, timeout=60.0)
 
 
 @patch("asyncio.Queue.put")