Fix status while disconnected, update tests accordingly (#96)

Author: mvn23

pyotgw/connection.py

@@ -112,18 +112,19 @@ async def _attempt_connect(self):
         self._retry_timeout = MIN_RETRY_TIMEOUT
         while transport is None:
             try:
-                transport, protocol = await (
-                    serial_asyncio_fast.create_serial_connection(
-                        loop,
-                        partial(
-                            OpenThermProtocol,
-                            self._otgw.status,
-                            self.watchdog.inform,
-                        ),
-                        self._port,
-                        write_timeout=0,
-                        **self._config,
-                    )
+                (
+                    transport,
+                    protocol,
+                ) = await serial_asyncio_fast.create_serial_connection(
+                    loop,
+                    partial(
+                        OpenThermProtocol,
+                        self._otgw.status,
+                        self.watchdog.inform,
+                    ),
+                    self._port,
+                    write_timeout=0,
+                    **self._config,
                 )
                 await asyncio.wait_for(
                     protocol.init_and_wait_for_activity(),
@@ -169,6 +170,7 @@ async def _attempt_connect(self):
     async def _cleanup(self):
         """Cleanup possible leftovers from old connections"""
         await self.watchdog.stop()
+        self._otgw.status.reset()
         if self.protocol:
             await self.protocol.cleanup()
         if self._connecting_task is not None:

pyotgw/status.py

@@ -25,6 +25,7 @@ def reset(self):
         while not self._updateq.empty():
             self._updateq.get_nowait()
         self._status = deepcopy(v.DEFAULT_STATUS)
+        self._updateq.put_nowait(deepcopy(v.DEFAULT_STATUS))
 
     @property
     def status(self):

tests/test_messageprocessor.py

@@ -1,4 +1,5 @@
 """Test for pyotgw/messageprocessor.py"""
+
 import asyncio
 import logging
 import re
@@ -103,7 +104,7 @@ async def test_process_msgs(caplog, pygw_message_processor):
         "B",
         v.READ_ACK,
         b"\x23",
-        b"\x0A",
+        b"\x0a",
         b"\x01",
     )
     with patch.object(
@@ -155,6 +156,7 @@ async def empty_coroutine(status):
 
     for test_case, expected_result in pygw_proto_messages:
         pygw_message_processor.status_manager.reset()
+        pygw_message_processor.status_manager._updateq.get_nowait()
         await pygw_message_processor._process_msg(test_case)
         if expected_result is not None:
             await called_once(status_callback)
@@ -304,24 +306,16 @@ async def empty_coroutine(stat):
         return
 
     with patch.object(
-        pygw_message_processor.status_manager,
-        "submit_partial_update"
+        pygw_message_processor.status_manager, "submit_partial_update"
     ) as partial_update:
         await pygw_message_processor._quirk_trset_s2m(
             v.THERMOSTAT,
             b"\x01",
             b"\x02",
         )
-        await pygw_message_processor._quirk_trset_s2m(
-            v.BOILER,
-            b"\x14",
-            b"\x80"
-        )
+        await pygw_message_processor._quirk_trset_s2m(v.BOILER, b"\x14", b"\x80")
 
-    partial_update.assert_called_once_with(
-        v.BOILER,
-        {v.DATA_ROOM_SETPOINT: 20.5}
-    )
+    partial_update.assert_called_once_with(v.BOILER, {v.DATA_ROOM_SETPOINT: 20.5})
 
 
 def test_get_flag8(pygw_message_processor):
@@ -373,7 +367,7 @@ def test_get_u8(pygw_message_processor):
             0,
         ),
         (
-            b"\xFF",
+            b"\xff",
             255,
         ),
     )
@@ -390,7 +384,7 @@ def test_get_s8(pygw_message_processor):
             0,
         ),
         (
-            b"\xFF",
+            b"\xff",
             -1,
         ),
     )
@@ -411,7 +405,7 @@ def test_get_f8_8(pygw_message_processor):
         ),
         (
             (
-                b"\xFF",
+                b"\xff",
                 b"\x80",
             ),
             -0.5,
@@ -434,8 +428,8 @@ def test_get_u16(pygw_message_processor):
         ),
         (
             (
-                b"\xFF",
-                b"\xFF",
+                b"\xff",
+                b"\xff",
             ),
             65535,
         ),
@@ -457,8 +451,8 @@ def test_get_s16(pygw_message_processor):
         ),
         (
             (
-                b"\xFF",
-                b"\xFF",
+                b"\xff",
+                b"\xff",
             ),
             -1,
         ),

tests/test_status.py

@@ -1,4 +1,5 @@
 """Tests for pyotgw/status.py"""
+
 import asyncio
 import logging
 from unittest.mock import MagicMock
@@ -21,6 +22,7 @@ def test_reset(pygw_status):
     pygw_status.reset()
 
     assert pygw_status.status == v.DEFAULT_STATUS
+    assert pygw_status._updateq.get_nowait() == v.DEFAULT_STATUS
     assert pygw_status._updateq.empty()