Test stop of server task.

Author: janiversen

API_changes.rst

@@ -5,10 +5,11 @@ PyModbus - API changes.
 -------------
 Version 3.1.0
 -------------
-Added --host to client_* examples, to allow easier use.
-unit= in client calls are no longer converted to slave=, but raises a runtime exception.
-Added missing client calls (all standard request are not available as methods).
-client.mask_write_register() changed parameters.
+- Added --host to client_* examples, to allow easier use.
+- unit= in client calls are no longer converted to slave=, but raises a runtime exception.
+- Added missing client calls (all standard request are not available as methods).
+- client.mask_write_register() changed parameters.
+- server classes no longer accept reuse_port= (the socket do not accept it)
 
 ---------------------
 Version 3.0.1 / 3.0.2

check_ci.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
+trap 'echo "\"${last_command}\" command filed with exit code $?."' EXIT
+
+
+codespell
+black --safe --quiet examples/ pymodbus/ test/
+isort .
+pylint --recursive=y examples pymodbus test
+flake8
+pytest
+echo "Ready to push"

pymodbus/client/base.py

@@ -315,6 +315,8 @@ async def close(self):  # pylint: disable=invalid-overridden-method
         """Close connection."""
         if self.transport:
             self.transport.close()
+            while self.transport is not None:
+                await asyncio.sleep(0.1)
         self._connected = False
 
     def connection_lost(self, reason):

pymodbus/client/serial.py

@@ -76,8 +76,9 @@ def __init__(
 
     async def close(self):  # pylint: disable=invalid-overridden-method
         """Stop connection."""
-        if self.connected and self.protocol and self.protocol.transport:
-            self.protocol.transport.close()
+        if self.protocol:
+            await self.protocol.close()
+            await asyncio.sleep(0.1)
 
     def _create_protocol(self):
         """Create protocol."""
@@ -132,7 +133,9 @@ def protocol_lost_connection(self, protocol):
                 _logger.error("Serial: protocol is not self.protocol.")
 
             self._connected_event.clear()
-            self.protocol = None
+            if self.protocol is not None:
+                del self.protocol
+                self.protocol = None
             # if self.host:
             #     asyncio.asynchronous(self._reconnect())
         else:

pymodbus/client/tcp.py

@@ -70,9 +70,9 @@ async def close(self):  # pylint: disable=invalid-overridden-method
 
         # prevent reconnect.
         self.delay_ms = 0
-
-        if self.connected and self.protocol and self.protocol.transport:
-            self.protocol.transport.close()
+        if self.protocol:
+            await self.protocol.close()
+            await asyncio.sleep(0.1)
 
     def _create_protocol(self):
         """Create initialized protocol instance with factory function."""
@@ -130,7 +130,9 @@ def protocol_lost_connection(self, protocol):
             )
 
         self.connected = False
-        self.protocol = None
+        if self.protocol is not None:
+            del self.protocol
+            self.protocol = None
         if self.delay_ms > 0:
             asyncio.ensure_future(self._reconnect())
 

pymodbus/client/udp.py

@@ -89,9 +89,9 @@ async def close(self):  # pylint: disable=invalid-overridden-method
         """
         # prevent reconnect:
         self.delay_ms = 0
-
-        if self.connected and self.protocol and self.protocol.transport:
-            self.protocol.transport.close()
+        if self.protocol:
+            await self.protocol.close()
+            await asyncio.sleep(0.1)
 
     def _create_protocol(self, host=None, port=0):
         """Create initialized protocol instance with factory function."""
@@ -157,7 +157,9 @@ def protocol_lost_connection(self, protocol):
                 )
 
             self.connected = False
-            self.protocol = None
+            if self.protocol is not None:
+                del self.protocol
+                self.protocol = None
             if self.delay_ms > 0:
                 asyncio.create_task(self._reconnect())
         else:
@@ -201,7 +203,7 @@ def __init__(
         source_address: typing.Tuple[str, int] = None,
         **kwargs: any,
     ) -> None:
-        """Initialize Asyncio Modbus UDP Client."""
+        """Initialize Modbus UDP Client."""
         super().__init__(framer=framer, **kwargs)
         self.params.host = host
         self.params.port = port