Correct future. (#2507)

Author: janiversen

examples/client_custom_msg.py

@@ -15,6 +15,7 @@
 
 from pymodbus import FramerType
 from pymodbus.client import AsyncModbusTcpClient as ModbusClient
+from pymodbus.exceptions import ModbusIOException
 from pymodbus.pdu import ExceptionResponse, ModbusPDU
 from pymodbus.pdu.bit_message import ReadCoilsRequest
 
@@ -128,8 +129,12 @@ async def main(host="localhost", port=5020):
         client.register(CustomModbusPDU)
         slave=1
         request1 = CustomRequest(32, slave=slave)
-        result = await client.execute(False, request1)
-        print(result)
+        try:
+            result = await client.execute(False, request1)
+        except ModbusIOException:
+            print("Server do not support CustomRequest.")
+        else:
+            print(result)
 
         # inherited request
         request2 = Read16CoilsRequest(32, slave)

pymodbus/transaction/transaction.py

@@ -133,6 +133,7 @@ async def execute(self, no_response_expected: bool, request: ModbusPDU) -> Modbu
             request.transaction_id = self.getNextTID()
             count_retries = 0
             while count_retries <= self.retries:
+                self.response_future = asyncio.Future()
                 self.pdu_send(request)
                 if no_response_expected:
                     return None
@@ -141,11 +142,9 @@ async def execute(self, no_response_expected: bool, request: ModbusPDU) -> Modbu
                         self.response_future, timeout=self.comm_params.timeout_connect
                     )
                     self.count_no_responses = 0
-                    self.response_future = asyncio.Future()
                     return response
                 except asyncio.exceptions.TimeoutError:
                     count_retries += 1
-            self.response_future = asyncio.Future()
             if self.count_no_responses >= self.accept_no_response_limit:
                 self.connection_lost(asyncio.TimeoutError("Server not responding"))
                 raise ModbusIOException(

test/examples/test_examples.py

@@ -156,8 +156,7 @@ async def test_custom_msg(
         if use_comm != "tcp" or use_framer != "socket":
             return
         assert mock_server
-        with pytest.raises(asyncio.CancelledError):
-            await main_custom_client(port=use_port, host=use_host)
+        await main_custom_client(port=use_port, host=use_host)
 
     async def test_payload(self, mock_clc, mock_cls):
         """Test server/client with payload."""

test/transaction/test_transaction.py

@@ -165,9 +165,10 @@ async def test_transaction_execute(self, use_clc, scenario):
                 await transact.execute(False, request)
         else: # if scenario == 5: # response
             transact.comm_params.timeout_connect = 0.2
-            transact.response_future.set_result(response)
             resp = asyncio.create_task(transact.execute(False, request))
-            await asyncio.sleep(0.2)
+            await asyncio.sleep(0.1)
+            transact.response_future.set_result(response)
+            await asyncio.sleep(0.1)
             assert response == await resp
 
     async def test_transaction_receiver(self, use_clc):