test.

Author: janiversen

pymodbus/server/async_io.py

@@ -2,6 +2,7 @@
 # pylint: disable=missing-type-doc
 import asyncio
 import ssl
+import time
 import traceback
 
 from pymodbus.client.serial_asyncio import create_serial_connection
@@ -1082,6 +1083,8 @@ def stop(cls):
         if not cls.active_server:
             raise RuntimeError("ServerStop called with loop stopped.")
         asyncio.run_coroutine_threadsafe(cls.async_stop(), cls.active_server.loop)
+        time.sleep(10)
+
 
 
 async def StartAsyncUnixServer(  # pylint: disable=invalid-name,dangerous-default-value

test/test_server_task.py

@@ -100,7 +100,7 @@ def helper_config(request, def_type):
                 "certfile": f"{path}/certificates/pymodbus.crt",
                 "keyfile": f"{path}/certificates/pymodbus.key",
                 "server_hostname": "localhost",
-                "timeout": 0.2,
+                "timeout": 2,
             },
             "async": {
                 "srv": server.StartAsyncTlsServer,
@@ -245,7 +245,7 @@ def test_sync_task_no_server(comm):
 def test_sync_task_ok(comm):
     """Test normal client/server handling."""
     run_server, server_args, run_client, client_args = helper_config(comm, "sync")
-    if comm in {}:
+    if comm in {"tls", "udp", "serial"}:
         return
     thread = Thread(target=run_server, kwargs=server_args)
     thread.daemon = True
@@ -262,49 +262,51 @@ def test_sync_task_ok(comm):
     sleep(0.1)
     assert not client.socket
     server.ServerStop()
+    thread.join()
 
 
 @pytest.mark.xdist_group(name="task_serialize")
 @pytest.mark.parametrize("comm", TEST_TYPES)
 def test_sync_task_server_stop(comm):
     """Test normal client/server handling."""
     run_server, server_args, run_client, client_args = helper_config(comm, "sync")
-    if comm:
-        return  # SKIP TEST FOR NOW
+    if comm in {"tls", "udp", "serial", "tcp"}:
+        return
 
-    # task = asyncio.create_task(run_server(**server_args))
-    # await asyncio.sleep(0.1)
-    # client = run_client(**client_args)
-    # await client.connect()
-    # assert client.protocol
-    # rr = await client.read_coils(1, 1, slave=0x01)
-    # assert len(rr.bits) == 8
+    thread = Thread(target=run_server, kwargs=server_args)
+    thread.daemon = True
+    thread.start()
+    sleep(0.1)
+    client = run_client(**client_args)
+    client.connect()
+    assert client.socket
+    rr = client.read_coils(1, 1, slave=0x01)
+    assert len(rr.bits) == 8
 
     # Server breakdown
-    # await server.ServerAsyncStop()
-    # await task
+    server.ServerStop()
 
-    # with pytest.raises((ConnectionException, asyncio.exceptions.TimeoutError)):
-    #     rr = await client.read_coils(1, 1, slave=0x01)
-    # assert not client.protocol
+    with pytest.raises((ConnectionException, asyncio.exceptions.TimeoutError)):
+        rr = client.read_coils(1, 1, slave=0x01)
+    assert not client.socket
 
     # Server back online
-    # task = asyncio.create_task(run_server(**server_args))
-    # await asyncio.sleep(0.1)
-
-    # timer_allowed = 100
-    # while not client.protocol:
-    #     await asyncio.sleep(0.1)
-    #     timer_allowed -= 1
-    #     if not timer_allowed:
-    #         assert False, "client do not reconnect"
-    # assert client.protocol
-
-    # rr = await client.read_coils(1, 1, slave=0x01)
-    # assert len(rr.bits) == 8
-
-    # await client.close()
-    # await asyncio.sleep(0.5)
-    # assert not client.protocol
-    # await server.ServerAsyncStop()
-    # await task
+    thread = Thread(target=run_server, kwargs=server_args)
+    thread.daemon = True
+    thread.start()
+
+    timer_allowed = 100
+    while not client.protocol:
+        sleep(0.1)
+        timer_allowed -= 1
+        if not timer_allowed:
+            assert False, "client do not reconnect"
+    assert client.socket
+
+    rr = client.read_coils(1, 1, slave=0x01)
+    assert len(rr.bits) == 8
+
+    client.close()
+    sleep(0.5)
+    assert not client.socket
+    server.ServerStop()