Fix Modbus review comments (#33755)
* update common test for modbus integration * remove log messages from modbus setup function. * Make global method local * Change parameter name to snake_case
This commit is contained in:
1 parent
c19a1bf26d
commit
b3286a4a01
6 files changed
+16
-26
No files matched your search
@@ -32,9 +32,6 @@ def mock_hub(hass):
|
||||
return hub
|
||||
|
||||
|
||||
common_register_config = {CONF_NAME: "test-config", CONF_REGISTER: 1234}
|
||||
|
||||
|
||||
class ReadResult:
|
||||
"""Storage class for register read results."""
|
||||
|
||||
@@ -46,18 +43,16 @@ class ReadResult:
|
||||
read_result = None
|
||||
|
||||
|
||||
async def simulate_read_registers(unit, address, count):
|
||||
"""Simulate modbus register read."""
|
||||
del unit, address, count # not used in simulation, but in real connection
|
||||
global read_result
|
||||
return read_result
|
||||
|
||||
|
||||
async def run_test(
|
||||
hass, mock_hub, register_config, entity_domain, register_words, expected
|
||||
hass, use_mock_hub, register_config, entity_domain, register_words, expected
|
||||
):
|
||||
"""Run test for given config and check that sensor outputs expected result."""
|
||||
|
||||
async def simulate_read_registers(unit, address, count):
|
||||
"""Simulate modbus register read."""
|
||||
del unit, address, count # not used in simulation, but in real connection
|
||||
return read_result
|
||||
|
||||
# Full sensor configuration
|
||||
sensor_name = "modbus_test_sensor"
|
||||
scan_interval = 5
|
||||
@@ -72,12 +67,11 @@ async def run_test(
|
||||
}
|
||||
|
||||
# Setup inputs for the sensor
|
||||
global read_result
|
||||
read_result = ReadResult(register_words)
|
||||
if register_config.get(CONF_REGISTER_TYPE) == CALL_TYPE_REGISTER_INPUT:
|
||||
mock_hub.read_input_registers = simulate_read_registers
|
||||
use_mock_hub.read_input_registers = simulate_read_registers
|
||||
else:
|
||||
mock_hub.read_holding_registers = simulate_read_registers
|
||||
use_mock_hub.read_holding_registers = simulate_read_registers
|
||||
|
||||
# Initialize sensor
|
||||
now = dt_util.utcnow()
|
||||
|
||||
Reference in new issue
Block a user