Proof transport reconnect works.

Author: janiversen

examples/client_async.py

@@ -121,7 +121,6 @@ async def run_async_client(client, modbus_calls=None):
     """Run sync client."""
     _logger.info("### Client starting")
     await client.connect()
-    print("jan " + str(client.connected))
     assert client.connected
     if modbus_calls:
         await modbus_calls(client)

test/transport/test_reconnect.py

@@ -0,0 +1,117 @@
+"""Test transport."""
+import os
+from unittest import mock
+
+from pymodbus.framer import ModbusFramer
+from pymodbus.transport.transport import BaseTransport
+
+
+class TestBaseTransport:
+    """Test transport module, base part."""
+
+    base_comm_name = "test comm"
+    base_reconnect_delay = 1
+    base_reconnect_delay_max = 3.5
+    base_timeout_connect = 2
+    base_framer = ModbusFramer
+    base_host = "test host"
+    base_port = 502
+    base_server_hostname = "server test host"
+    base_baudrate = 9600
+    base_bytesize = 8
+    base_parity = "e"
+    base_stopbits = 2
+    cwd = None
+
+    class dummy_transport(BaseTransport):
+        """Transport class for test."""
+
+        def __init__(self):
+            """Initialize."""
+            super().__init__(
+                TestBaseTransport.base_comm_name,
+                [
+                    TestBaseTransport.base_reconnect_delay * 1000,
+                    TestBaseTransport.base_reconnect_delay_max * 1000,
+                ],
+                TestBaseTransport.base_timeout_connect * 1000,
+                TestBaseTransport.base_framer,
+                None,
+                None,
+                None,
+            )
+            self.abort = mock.MagicMock()
+            self.close = mock.MagicMock()
+
+    @classmethod
+    async def setup_BaseTransport(cls):
+        """Create base object."""
+        base = BaseTransport(
+            cls.base_comm_name,
+            (cls.base_reconnect_delay * 1000, cls.base_reconnect_delay_max * 1000),
+            cls.base_timeout_connect * 1000,
+            cls.base_framer,
+            mock.MagicMock(),
+            mock.MagicMock(),
+            mock.MagicMock(),
+        )
+        params = base.CommParamsClass(
+            done=True,
+            comm_name=cls.base_comm_name,
+            reconnect_delay=cls.base_reconnect_delay,
+            reconnect_delay_max=cls.base_reconnect_delay_max,
+            timeout_connect=cls.base_timeout_connect,
+            framer=cls.base_framer,
+        )
+        cls.cwd = os.getcwd().split("/")[-1]
+        if cls.cwd == "transport":
+            cls.cwd = "../../"
+        elif cls.cwd == "test":
+            cls.cwd = "../"
+        else:
+            cls.cwd = ""
+        cls.cwd = cls.cwd + "examples/certificates/pymodbus."
+        return base, params
+
+    async def test_connection_lost(self):
+        """Test connection_lost()."""
+        base, params = await self.setup_BaseTransport()
+        transport = self.dummy_transport()
+        base.connection_lost(transport)
+        assert not base.transport
+        assert not base.recv_buffer
+        assert not base.reconnect_timer
+        assert not base.reconnect_delay_current
+        base.cb_connection_made.assert_not_called()
+        base.cb_handle_data.assert_not_called()
+        base.cb_connection_lost.assert_called_once()
+        # reconnect is only after a successful connect
+        base.connection_made(transport)
+        base.connection_lost(transport)
+        assert base.reconnect_timer
+        assert not base.transport
+        assert not base.recv_buffer
+        assert base.reconnect_timer
+        assert base.reconnect_delay_current == 2 * params.reconnect_delay
+        base.cb_connection_lost.call_count == 2
+        base.close()
+        assert not base.reconnect_timer
+
+    async def test_close(self):
+        """Test close()."""
+        base, _params = await self.setup_BaseTransport()
+        transport = self.dummy_transport()
+        base.connection_made(transport)
+        base.cb_connection_made.reset_mock()
+        base.cb_connection_lost.reset_mock()
+        base.cb_handle_data.reset_mock()
+        base.recv_buffer = b"abc"
+        base.reconnect_timer = mock.MagicMock()
+        base.close()
+        transport.abort.assert_called_once()
+        transport.close.assert_called_once()
+        base.cb_connection_made.assert_not_called()
+        base.cb_connection_lost.assert_not_called()
+        base.cb_handle_data.assert_not_called()
+        assert not base.recv_buffer
+        assert not base.reconnect_timer