Correct flaky force_poll tests.

pymodbus-dev · Jul 20, 2024 · 7a3a791 · 7a3a791
1 parent 063f504
commit 7a3a791
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/test/transport/test_comm.py b/test/transport/test_comm.py
@@ -174,6 +174,10 @@ async def test_split_serial_packet(self, client, server, use_port):
     )
     async def test_serial_poll(self, client, server, use_port):
         """Test connection and data exchange."""
+        if SerialTransport.force_poll:
+            client.close()
+            server.close()
+            return
         Log.debug("test_serial_poll {}", use_port)
         assert await server.listen()
         SerialTransport.force_poll = True
@@ -188,6 +192,7 @@ async def test_serial_poll(self, client, server, use_port):
         assert not client.recv_buffer
         client.close()
         server.close()
+        SerialTransport.force_poll = False
 
     @pytest.mark.parametrize(
         ("use_comm_type", "use_host"),

diff --git a/test/transport/test_serial.py b/test/transport/test_serial.py
@@ -81,6 +81,8 @@ async def test_create_serial(self):
 
     async def test_force_poll(self):
         """Test external methods."""
+        if SerialTransport.force_poll:
+            return
         SerialTransport.force_poll = True
         transport, protocol = await create_serial_connection(
             asyncio.get_running_loop(), mock.Mock, "dummy"
@@ -94,6 +96,8 @@ async def test_force_poll(self):
 
     async def test_write_force_poll(self):
         """Test write with poll."""
+        if SerialTransport.force_poll:
+            return
         SerialTransport.force_poll = True
         transport, protocol = await create_serial_connection(
             asyncio.get_running_loop(), mock.Mock, "dummy"