Fix tests. closes #608. closes #575

Author: dhoomakethu

CHANGELOG.rst

@@ -5,6 +5,9 @@ version 2.5.0
 * Update reactive server to send stray response of given length.
 * Transaction manager updates on retries for empty and invalid packets.
 * Test fixes for asyncio client and transaction manager.
+* Fix sync client and processing of incomplete frames with rtu framers
+* Support synchronous diagnostic client (TCP)
+* Server updates (REPL and async)
 
 version 2.5.0rc3
 ----------------------------------------------------------

pymodbus/client/sync.py

@@ -155,8 +155,8 @@ def _dump(self, data, direction):
         try:
             fd.write(hexlify_packets(data))
         except Exception as e:
-            self._logger.debug(hexlify_packets(data))
-            self._logger.exception(e)
+            _logger.debug(hexlify_packets(data))
+            _logger.exception(e)
 
     def register(self, function):
         """

pymodbus/client/sync_diag.py

@@ -74,7 +74,7 @@ def __init__(self, host='127.0.0.1', port=Defaults.Port,
         .. note:: The host argument will accept ipv4 and ipv6 hosts
         """
         self.warn_delay_limit = kwargs.get('warn_delay_limit', True)
-        super().__init__(host, port, framer, **kwargs)
+        super(ModbusTcpDiagClient, self).__init__(host, port, framer, **kwargs)
         if self.warn_delay_limit is True:
             self.warn_delay_limit = self.timeout / 2
 
@@ -112,7 +112,7 @@ def _recv(self, size):
         try:
             start = time.time()
 
-            result = super()._recv(size)
+            result = super(ModbusTcpDiagClient, self)._recv(size)
 
             delay = time.time() - start
             if self.warn_delay_limit is not None and delay >= self.warn_delay_limit:

pymodbus/utilities.py

@@ -245,7 +245,10 @@ def hexlify_packets(packet):
     """
     if not packet:
         return ''
-    return " ".join([hex(byte2int(x)) for x in packet])
+    if IS_PYTHON3:
+        return " ".join([hex(byte2int(x)) for x in packet])
+    else:
+        return u" ".join([hex(byte2int(x)) for x in packet])
 # --------------------------------------------------------------------------- #
 # Exported symbols
 # --------------------------------------------------------------------------- #

test/test_client_sync.py

@@ -86,8 +86,8 @@ def testBaseModbusClient(self):
         self.assertEqual(False, client.debug_enabled())
         writable = StringIO()
         client.trace(writable)
-        client._dump([0, 1, 2], None)
-        self.assertEqual(hexlify_packets([0, 1, 2]), writable.getvalue())
+        client._dump(b'\x00\x01\x02', None)
+        self.assertEqual(hexlify_packets(b'\x00\x01\x02'), writable.getvalue())
 
         # a successful execute
         client.connect = lambda: True
@@ -154,7 +154,7 @@ def settimeout(self, *a, **kwa):
     def testUdpClientIsSocketOpen(self):
         ''' Test the udp client is_socket_open method'''
         client = ModbusUdpClient()
-        self.assertFalse(client.is_socket_open())
+        self.assertTrue(client.is_socket_open())
 
     def testUdpClientSend(self):
         ''' Test the udp client send method'''
@@ -434,7 +434,7 @@ def testBasicSyncSerialClient(self, mock_serial):
         client.close()
 
         # rtu connect/disconnect
-        rtu_client = ModbusSerialClient(method='rtu')
+        rtu_client = ModbusSerialClient(method='rtu', strict=True)
         self.assertTrue(rtu_client.connect())
         self.assertEqual(rtu_client.socket.interCharTimeout, rtu_client.inter_char_timeout)
         rtu_client.close()

test/test_framers.py

@@ -10,7 +10,7 @@
 if IS_PYTHON3:
     from unittest.mock import Mock, patch
 else:  # Python 2
-    from mock import Mock
+    from mock import Mock, patch
 
 
 @pytest.fixture

test/test_transaction.py

@@ -144,7 +144,10 @@ def testExecute(self, mock_time):
         # wrong handle_local_echo
         tm._recv = MagicMock(side_effect=iter([b'abcdef', b'deadbe', b'123456']))
         client.handle_local_echo = True
-        self.assertEqual(tm.execute(request).message, '[Input/Output] Wrong local echo')
+        tm.retry_on_empty = False
+        tm.retry_on_invalid = False
+        self.assertEqual(tm.execute(request).message,
+                         '[Input/Output] Wrong local echo')
         client.handle_local_echo = False
 
         # retry on invalid response