Tidy up

Author: tjhowse

modbus4mqtt/modbus_interface.py

@@ -1,5 +1,3 @@
-from time import time, sleep, monotonic
-
 from enum import Enum
 import logging
 from queue import Queue

tests/test_modbus.py

@@ -1,7 +1,6 @@
-import os
 from collections import namedtuple
 import unittest
-from unittest.mock import patch, call, Mock
+from unittest.mock import patch, Mock
 
 from modbus4mqtt import modbus_interface
 from pymodbus import ModbusException

tests/test_modbus_server.py

@@ -1,24 +1,20 @@
 import json
-from queue import Queue
 import pytest
 from modbus4mqtt.modbus4mqtt import mqtt_interface
 import pytest_asyncio
 import random
 from time import monotonic, sleep
-from pymodbus.server import ModbusTcpServer
-from pymodbus.datastore import ModbusServerContext, ModbusSequentialDataBlock, ModbusSparseDataBlock
 import threading
 import asyncio
 from paho.mqtt import client as mqtt_client
 
 from pymodbus import ModbusDeviceIdentification
+from pymodbus.server import ModbusTcpServer
 from pymodbus.datastore import (
     ModbusDeviceContext,
     ModbusSequentialDataBlock,
     ModbusServerContext,
 )
-from pymodbus.server import ModbusTcpServer
-import asyncio
 
 
 class ModbusServer:

tests/test_modbustable.py

@@ -59,7 +59,7 @@ def test_generate_batched_addresses_max_batch():
     # Should batch: [1,2,3,4] (start=1, len=4), [5] (start=5, len=1)
     assert batches == [[1, 4], [5, 1]]
 
-def test_generate_batched_addresses_max_batch():
+def test_generate_batched_addresses_max_batch_write_mode():
     table = ModbusTable(4)
     for addr in range(1, 6):
         table.add_register(addr)