Fix tests for changes in pymodbus API

3cky · Sep 29, 2023 · 18fb6d0 · 18fb6d0
1 parent 4e5c7e3
commit 18fb6d0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/tests/environment/rtu_slave.py b/tests/environment/rtu_slave.py
@@ -14,7 +14,7 @@
 #---------------------------------------------------------------------------#
 #from pymodbus.server.async import StartTcpServer
 #from pymodbus.server.async import StartUdpServer
-from pymodbus.server.asynchronous import StartSerialServer
+from pymodbus.server import StartSerialServer
 
 from pymodbus.device import ModbusDeviceIdentification
 from pymodbus.datastore import ModbusSequentialDataBlock
@@ -92,7 +92,7 @@ def _start_rtu_server(self, framer=ModbusRtuFramer):
             hr = ModbusSequentialDataBlock(0, [0]*8), # holding regs
             ir = ModbusSequentialDataBlock(0, list(range(8))), # input regs
             zero_mode=True) # request(0-7) will map to the address (0-7)
-        context = ModbusServerContext(slaves=store, single=True)
+        context = ModbusServerContext(slaves={1: store}, single=False)
 
         #---------------------------------------------------------------------------#
         # initialize the server information
@@ -112,7 +112,7 @@ def _start_rtu_server(self, framer=ModbusRtuFramer):
         #---------------------------------------------------------------------------#
         #StartTcpServer(context, identity=identity, address=("localhost", 5020))
         #StartUdpServer(context, identity=identity, address=("localhost", 502))
-        StartSerialServer(context, identity=identity, port=self.serialPort, baudrate=19200, framer=framer, broadcast_enable=True)
+        StartSerialServer(context=context, identity=identity, port=self.serialPort, baudrate=19200, framer=framer, broadcast_enable=True)
         #StartSerialServer(context, identity=identity, port='/dev/pts/3', framer=ModbusAsciiFramer)
 
     p = None

diff --git a/tests/run_itests.py b/tests/run_itests.py
@@ -8,7 +8,7 @@
 from os.path import isfile
 from time import sleep
 
-from pymodbus.client.sync import ModbusTcpClient
+from pymodbus.client import ModbusTcpClient
 from pymodbus.pdu import ExceptionResponse
 from pymodbus.bit_read_message import ReadDiscreteInputsResponse, ReadCoilsResponse
 from pymodbus.bit_write_message import WriteMultipleCoilsResponse, WriteSingleCoilResponse
@@ -62,75 +62,75 @@ def test_coils(self):
         bits = [random.randrange(2)>0 for i in range(8)]
 
         # 15 Write Multiple Coils
-        result = self.client.write_coils(0, bits, unit=1)
+        result = self.client.write_coils(0, bits, slave=1)
         self.assertIsInstance(result, WriteMultipleCoilsResponse, result)
         self.assertEqual(result.address, 0, result)
         self.assertEqual(result.count, 8, result)
 
         # 01 Read Coils
-        result = self.client.read_coils(0, 8, unit=1)
+        result = self.client.read_coils(0, 8, slave=1)
         self.assertIsInstance(result, ReadCoilsResponse, result)
         self.assertEqual(result.bits, bits, result)
 
         # 05 Write Single Coil
         bit1 = not bits[0]
-        result = self.client.write_coil(0, bit1, unit=1)
+        result = self.client.write_coil(0, bit1, slave=1)
         self.assertIsInstance(result, WriteSingleCoilResponse, result)
         self.assertEqual(result.address, 0, result)
         self.assertEqual(result.value, bit1, result)
-        result = self.client.read_coils(0, 1, unit=1)
+        result = self.client.read_coils(0, 1, slave=1)
         self.assertIsInstance(result, ReadCoilsResponse, result)
         self.assertEqual(result.bits[0], bit1, result)
 
     def test_discreteInputs(self):
         # 02 Read Discrete Inputs
-        result = self.client.read_discrete_inputs(0, 8, unit=1)
+        result = self.client.read_discrete_inputs(0, 8, slave=1)
         self.assertIsInstance(result, ReadDiscreteInputsResponse, result)
         self.assertEqual(result.bits, [True]*8, result)
 
     def test_inputRegisters(self):
         # 04 Read Input Registers
-        result = self.client.read_input_registers(0, 8, unit=1)
+        result = self.client.read_input_registers(0, 8, slave=1)
         self.assertIsInstance(result, ReadInputRegistersResponse, result)
         self.assertEqual(result.registers, list(range(8)), result)
 
     def test_holdingRegisters(self):
         registers = [random.randrange(8) for i in range(8)]
 
         # 16 Write Multiple Holding Registers
-        result = self.client.write_registers(0, registers, unit=1)
+        result = self.client.write_registers(0, registers, slave=1)
         self.assertIsInstance(result, WriteMultipleRegistersResponse, result)
         self.assertEqual(result.address, 0, result)
         self.assertEqual(result.count, 8, result)
 
         # 03 Read Multiple Holding Registers
-        result = self.client.read_holding_registers(0, 8, unit=1)
+        result = self.client.read_holding_registers(0, 8, slave=1)
         self.assertIsInstance(result, ReadHoldingRegistersResponse, result)
         self.assertEqual(result.registers, registers, result)
 
         # 06 Write Single Holding Register
         register1 = (registers[0] + 1) % 65535
-        result = self.client.write_register(0, register1, unit=1)
+        result = self.client.write_register(0, register1, slave=1)
         self.assertIsInstance(result, WriteSingleRegisterResponse, result)
         self.assertEqual(result.address, 0, result)
         self.assertEqual(result.value, register1, result)
-        result = self.client.read_holding_registers(0, 1, unit=1)
+        result = self.client.read_holding_registers(0, 1, slave=1)
         self.assertIsInstance(result, ReadHoldingRegistersResponse, result)
         self.assertEqual(result.registers[0], register1, result)
 
     def test_exception(self):
-        result = self.client.write_coil(1000, False, unit=1) # invalid address 1000
+        result = self.client.write_coil(1000, False, slave=1) # invalid address 1000
         self.assertIsInstance(result, ExceptionResponse, result)
         self.assertEqual(result.original_code, 5, result) # fc05 Write Single Coil
         self.assertEqual(result.exception_code, 2, result) # Illegal Data Address
 
     def test_broadcast(self):
         registers = [random.randrange(8) for i in range(8)]
         # 16 Write Multiple Holding Registers
-        result = self.client.write_registers(0, registers, unit=0)
+        result = self.client.write_registers(0, registers, slave=0)
 
         # 03 Read Multiple Holding Registers
-        result = self.client.read_holding_registers(0, 8, unit=1)
+        result = self.client.read_holding_registers(0, 8, slave=1)
         self.assertIsInstance(result, ReadHoldingRegistersResponse, result)
         self.assertEqual(result.registers, registers, result)