Solve multiple incomming frames. (#1107)

Author: janiversen

pymodbus/framer/rtu_framer.py

@@ -232,21 +232,25 @@ def processIncomingPacket(
             unit = [unit]
         self.addToFrame(data)
         single = kwargs.get("single", False)
-        if self.isFrameReady():
-            if self.checkFrame():
-                if self._validate_unit_id(unit, single):
-                    self._process(callback)
+        while True:
+            if self.isFrameReady():
+                if self.checkFrame():
+                    if self._validate_unit_id(unit, single):
+                        self._process(callback)
+                    else:
+                        header_txt = self._header["uid"]
+                        txt = f"Not a valid unit id - {header_txt}, ignoring!!"
+                        _logger.debug(txt)
+                        self.resetFrame()
+                        break
                 else:
-                    header_txt = self._header["uid"]
-                    txt = f"Not a valid unit id - {header_txt}, ignoring!!"
-                    _logger.debug(txt)
+                    _logger.debug("Frame check failed, ignoring!!")
                     self.resetFrame()
+                    break
             else:
-                _logger.debug("Frame check failed, ignoring!!")
-                self.resetFrame()
-        else:
-            txt = f"Frame - [{data}] not ready"
-            _logger.debug(txt)
+                txt = f"Frame - [{data}] not ready"
+                _logger.debug(txt)
+                break
 
     def buildPacket(self, message):
         """Create a ready to send modbus packet.

test/test_framers.py

@@ -266,8 +266,8 @@ def test_rtu_incoming_packet(rtu_framer, data):  # pylint: disable=redefined-out
     """Test rtu process incoming packet."""
     buffer, units, reset_called, process_called = data
 
-    with patch.object(rtu_framer, "_process") as mock_process, patch.object(
-        rtu_framer, "resetFrame"
+    with patch.object(rtu_framer, "_process", wraps=rtu_framer._process) as mock_process, patch.object(  # pylint: disable=protected-access
+        rtu_framer, "resetFrame", wraps=rtu_framer.resetFrame
     ) as mock_reset:
         rtu_framer.processIncomingPacket(buffer, Mock(), units)
         assert mock_process.call_count == (1 if process_called else 0)  # nosec