diff --git a/tests/components/modbus/conftest.py b/tests/components/modbus/conftest.py
index 62cf12958d3b15b818a24bcb2b0c5a4644681dcd..1253a856bbfae9d0d814d7d37eed6ce4155399dc 100644
--- a/tests/components/modbus/conftest.py
+++ b/tests/components/modbus/conftest.py
@@ -47,12 +47,36 @@ class ReadResult:
return False
+@pytest.fixture(name="check_config_loaded")
+def check_config_loaded_fixture():
+ """Set default for check_config_loaded."""
+ return True
+
+
+@pytest.fixture(name="register_words")
+def register_words_fixture():
+ """Set default for register_words."""
+ return [0x00, 0x00]
+
+
+@pytest.fixture(name="config_addon")
+def config_addon_fixture():
+ """Add extra configuration items."""
+ return None
+
+
+@pytest.fixture(name="do_exception")
+def do_exception_fixture():
+ """Remove side_effect to pymodbus calls."""
+ return False
+
+
@pytest.fixture(name="mock_pymodbus")
-def mock_pymodbus_fixture():
+def mock_pymodbus_fixture(do_exception, register_words):
"""Mock pymodbus."""
mock_pb = mock.AsyncMock()
mock_pb.close = mock.MagicMock()
- read_result = ReadResult([])
+ read_result = ReadResult(register_words if register_words else [])
mock_pb.read_coils.return_value = read_result
mock_pb.read_discrete_inputs.return_value = read_result
mock_pb.read_input_registers.return_value = read_result
@@ -61,6 +85,16 @@ def mock_pymodbus_fixture():
mock_pb.write_registers.return_value = read_result
mock_pb.write_coil.return_value = read_result
mock_pb.write_coils.return_value = read_result
+ if do_exception:
+ exc = ModbusException("mocked pymodbus exception")
+ mock_pb.read_coils.side_effect = exc
+ mock_pb.read_discrete_inputs.side_effect = exc
+ mock_pb.read_input_registers.side_effect = exc
+ mock_pb.read_holding_registers.side_effect = exc
+ mock_pb.write_register.side_effect = exc
+ mock_pb.write_registers.side_effect = exc
+ mock_pb.write_coil.side_effect = exc
+ mock_pb.write_coils.side_effect = exc
with (
mock.patch(
"homeassistant.components.modbus.modbus.AsyncModbusTcpClient",
@@ -81,33 +115,9 @@ def mock_pymodbus_fixture():
yield mock_pb
-@pytest.fixture(name="check_config_loaded")
-def check_config_loaded_fixture():
- """Set default for check_config_loaded."""
- return True
-
-
-@pytest.fixture(name="register_words")
-def register_words_fixture():
- """Set default for register_words."""
- return [0x00, 0x00]
-
-
-@pytest.fixture(name="config_addon")
-def config_addon_fixture():
- """Add entra configuration items."""
- return None
-
-
-@pytest.fixture(name="do_exception")
-def do_exception_fixture():
- """Remove side_effect to pymodbus calls."""
- return False
-
-
@pytest.fixture(name="mock_modbus")
async def mock_modbus_fixture(
- hass, caplog, register_words, check_config_loaded, config_addon, do_config
+ hass, caplog, check_config_loaded, config_addon, do_config, mock_pymodbus
):
"""Load integration modbus using mocked pymodbus."""
conf = copy.deepcopy(do_config)
@@ -132,57 +142,23 @@ async def mock_modbus_fixture(
}
]
}
- mock_pb = mock.AsyncMock()
- mock_pb.close = mock.MagicMock()
+ now = dt_util.utcnow()
with mock.patch(
- "homeassistant.components.modbus.modbus.AsyncModbusTcpClient",
- return_value=mock_pb,
+ "homeassistant.helpers.event.dt_util.utcnow",
+ return_value=now,
autospec=True,
):
- now = dt_util.utcnow()
- with mock.patch(
- "homeassistant.helpers.event.dt_util.utcnow",
- return_value=now,
- autospec=True,
- ):
- result = await async_setup_component(hass, DOMAIN, config)
- assert result or not check_config_loaded
- await hass.async_block_till_done()
- yield mock_pb
-
-
-@pytest.fixture(name="mock_pymodbus_exception")
-async def mock_pymodbus_exception_fixture(hass, do_exception, mock_modbus):
- """Trigger update call with time_changed event."""
- if do_exception:
- exc = ModbusException("fail read_coils")
- mock_modbus.read_coils.side_effect = exc
- mock_modbus.read_discrete_inputs.side_effect = exc
- mock_modbus.read_input_registers.side_effect = exc
- mock_modbus.read_holding_registers.side_effect = exc
-
-
-@pytest.fixture(name="mock_pymodbus_return")
-async def mock_pymodbus_return_fixture(hass, register_words, mock_modbus):
- """Trigger update call with time_changed event."""
- read_result = ReadResult(register_words if register_words else [])
- mock_modbus.read_coils.return_value = read_result
- mock_modbus.read_discrete_inputs.return_value = read_result
- mock_modbus.read_input_registers.return_value = read_result
- mock_modbus.read_holding_registers.return_value = read_result
- mock_modbus.write_register.return_value = read_result
- mock_modbus.write_registers.return_value = read_result
- mock_modbus.write_coil.return_value = read_result
- mock_modbus.write_coils.return_value = read_result
- return mock_modbus
+ result = await async_setup_component(hass, DOMAIN, config)
+ assert result or not check_config_loaded
+ await hass.async_block_till_done()
+ return mock_pymodbus
@pytest.fixture(name="mock_do_cycle")
async def mock_do_cycle_fixture(
hass: HomeAssistant,
freezer: FrozenDateTimeFactory,
- mock_pymodbus_exception,
- mock_pymodbus_return,
+ mock_modbus,
) -> FrozenDateTimeFactory:
"""Trigger update call with time_changed event."""
freezer.tick(timedelta(seconds=1))
@@ -207,11 +183,12 @@ async def mock_test_state_fixture(hass, request):
return request.param
-@pytest.fixture(name="mock_ha")
-async def mock_ha_fixture(hass, mock_pymodbus_return):
+@pytest.fixture(name="mock_modbus_ha")
+async def mock_modbus_ha_fixture(hass, mock_modbus):
"""Load homeassistant to allow service calls."""
assert await async_setup_component(hass, "homeassistant", {})
await hass.async_block_till_done()
+ return mock_modbus
@pytest.fixture(name="caplog_setup_text")
diff --git a/tests/components/modbus/test_binary_sensor.py b/tests/components/modbus/test_binary_sensor.py
index 567618de3c6657e1735a4d261e5b7967361d0585..7ae933998cfc314cb350c16c4d8527da2f82c16b 100644
--- a/tests/components/modbus/test_binary_sensor.py
+++ b/tests/components/modbus/test_binary_sensor.py
@@ -207,7 +207,7 @@ async def test_all_binary_sensor(hass: HomeAssistant, expected, mock_do_cycle) -
],
)
async def test_service_binary_sensor_update(
- hass: HomeAssistant, mock_modbus, mock_ha
+ hass: HomeAssistant, mock_modbus_ha
) -> None:
"""Run test for service homeassistant.update_entity."""
@@ -217,7 +217,7 @@ async def test_service_binary_sensor_update(
await hass.async_block_till_done()
assert hass.states.get(ENTITY_ID).state == STATE_OFF
- mock_modbus.read_coils.return_value = ReadResult([0x01])
+ mock_modbus_ha.read_coils.return_value = ReadResult([0x01])
await hass.services.async_call(
"homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
)
diff --git a/tests/components/modbus/test_climate.py b/tests/components/modbus/test_climate.py
index 093dee678958a931e723582dbe209f016fc1c2c7..94778cdcbd21a24c8ba77be24f709b0a5533f274 100644
--- a/tests/components/modbus/test_climate.py
+++ b/tests/components/modbus/test_climate.py
@@ -496,10 +496,10 @@ async def test_temperature_error(hass: HomeAssistant, expected, mock_do_cycle) -
],
)
async def test_service_climate_update(
- hass: HomeAssistant, mock_modbus, mock_ha, result, register_words
+ hass: HomeAssistant, mock_modbus_ha, result, register_words
) -> None:
"""Run test for service homeassistant.update_entity."""
- mock_modbus.read_holding_registers.return_value = ReadResult(register_words)
+ mock_modbus_ha.read_holding_registers.return_value = ReadResult(register_words)
await hass.services.async_call(
"homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
)
@@ -611,10 +611,10 @@ async def test_service_climate_update(
],
)
async def test_service_climate_fan_update(
- hass: HomeAssistant, mock_modbus, mock_ha, result, register_words
+ hass: HomeAssistant, mock_modbus_ha, result, register_words
) -> None:
"""Run test for service homeassistant.update_entity."""
- mock_modbus.read_holding_registers.return_value = ReadResult(register_words)
+ mock_modbus_ha.read_holding_registers.return_value = ReadResult(register_words)
await hass.services.async_call(
"homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
)
@@ -751,10 +751,10 @@ async def test_service_climate_fan_update(
],
)
async def test_service_climate_swing_update(
- hass: HomeAssistant, mock_modbus, mock_ha, result, register_words
+ hass: HomeAssistant, mock_modbus_ha, result, register_words
) -> None:
"""Run test for service homeassistant.update_entity."""
- mock_modbus.read_holding_registers.return_value = ReadResult(register_words)
+ mock_modbus_ha.read_holding_registers.return_value = ReadResult(register_words)
await hass.services.async_call(
"homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
)
@@ -844,10 +844,10 @@ async def test_service_climate_swing_update(
],
)
async def test_service_climate_set_temperature(
- hass: HomeAssistant, temperature, result, mock_modbus, mock_ha
+ hass: HomeAssistant, temperature, result, mock_modbus_ha
) -> None:
"""Test set_temperature."""
- mock_modbus.read_holding_registers.return_value = ReadResult(result)
+ mock_modbus_ha.read_holding_registers.return_value = ReadResult(result)
await hass.services.async_call(
CLIMATE_DOMAIN,
"set_temperature",
@@ -954,10 +954,10 @@ async def test_service_climate_set_temperature(
],
)
async def test_service_set_hvac_mode(
- hass: HomeAssistant, hvac_mode, result, mock_modbus, mock_ha
+ hass: HomeAssistant, hvac_mode, result, mock_modbus_ha
) -> None:
"""Test set HVAC mode."""
- mock_modbus.read_holding_registers.return_value = ReadResult(result)
+ mock_modbus_ha.read_holding_registers.return_value = ReadResult(result)
await hass.services.async_call(
CLIMATE_DOMAIN,
@@ -1018,10 +1018,10 @@ async def test_service_set_hvac_mode(
],
)
async def test_service_set_fan_mode(
- hass: HomeAssistant, fan_mode, result, mock_modbus, mock_ha
+ hass: HomeAssistant, fan_mode, result, mock_modbus_ha
) -> None:
"""Test set Fan mode."""
- mock_modbus.read_holding_registers.return_value = ReadResult(result)
+ mock_modbus_ha.read_holding_registers.return_value = ReadResult(result)
await hass.services.async_call(
CLIMATE_DOMAIN,
"set_fan_mode",
@@ -1081,10 +1081,10 @@ async def test_service_set_fan_mode(
],
)
async def test_service_set_swing_mode(
- hass: HomeAssistant, swing_mode, result, mock_modbus, mock_ha
+ hass: HomeAssistant, swing_mode, result, mock_modbus_ha
) -> None:
"""Test set Swing mode."""
- mock_modbus.read_holding_registers.return_value = ReadResult(result)
+ mock_modbus_ha.read_holding_registers.return_value = ReadResult(result)
await hass.services.async_call(
CLIMATE_DOMAIN,
"set_swing_mode",
diff --git a/tests/components/modbus/test_cover.py b/tests/components/modbus/test_cover.py
index fa9e617d96debd8af8a395cec0a6e64982366aac..0860b3136ba838db87f52aaa26f1fa955c274ce6 100644
--- a/tests/components/modbus/test_cover.py
+++ b/tests/components/modbus/test_cover.py
@@ -182,13 +182,13 @@ async def test_register_cover(hass: HomeAssistant, expected, mock_do_cycle) -> N
},
],
)
-async def test_service_cover_update(hass: HomeAssistant, mock_modbus, mock_ha) -> None:
+async def test_service_cover_update(hass: HomeAssistant, mock_modbus_ha) -> None:
"""Run test for service homeassistant.update_entity."""
await hass.services.async_call(
"homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
)
assert hass.states.get(ENTITY_ID).state == STATE_CLOSED
- mock_modbus.read_holding_registers.return_value = ReadResult([0x01])
+ mock_modbus_ha.read_holding_registers.return_value = ReadResult([0x01])
await hass.services.async_call(
"homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
)
@@ -255,30 +255,30 @@ async def test_restore_state_cover(
},
],
)
-async def test_service_cover_move(hass: HomeAssistant, mock_modbus, mock_ha) -> None:
+async def test_service_cover_move(hass: HomeAssistant, mock_modbus_ha) -> None:
"""Run test for service homeassistant.update_entity."""
- mock_modbus.read_holding_registers.return_value = ReadResult([0x01])
+ mock_modbus_ha.read_holding_registers.return_value = ReadResult([0x01])
await hass.services.async_call(
"cover", "open_cover", {"entity_id": ENTITY_ID}, blocking=True
)
assert hass.states.get(ENTITY_ID).state == STATE_OPEN
- mock_modbus.read_holding_registers.return_value = ReadResult([0x00])
+ mock_modbus_ha.read_holding_registers.return_value = ReadResult([0x00])
await hass.services.async_call(
"cover", "close_cover", {"entity_id": ENTITY_ID}, blocking=True
)
assert hass.states.get(ENTITY_ID).state == STATE_CLOSED
- await mock_modbus.reset()
- mock_modbus.read_holding_registers.side_effect = ModbusException("fail write_")
+ await mock_modbus_ha.reset()
+ mock_modbus_ha.read_holding_registers.side_effect = ModbusException("fail write_")
await hass.services.async_call(
"cover", "close_cover", {"entity_id": ENTITY_ID}, blocking=True
)
- assert mock_modbus.read_holding_registers.called
+ assert mock_modbus_ha.read_holding_registers.called
assert hass.states.get(ENTITY_ID).state == STATE_UNAVAILABLE
- mock_modbus.read_coils.side_effect = ModbusException("fail write_")
+ mock_modbus_ha.read_coils.side_effect = ModbusException("fail write_")
await hass.services.async_call(
"cover", "close_cover", {"entity_id": ENTITY_ID2}, blocking=True
)
diff --git a/tests/components/modbus/test_fan.py b/tests/components/modbus/test_fan.py
index 9719de3601bbe6cc70455b1495868d253f152bf0..d52b9dc309a82b152a65e6ca895a5bacb930d759 100644
--- a/tests/components/modbus/test_fan.py
+++ b/tests/components/modbus/test_fan.py
@@ -262,7 +262,6 @@ async def test_fan_service_turn(
hass: HomeAssistant,
caplog: pytest.LogCaptureFixture,
mock_modbus,
- mock_pymodbus_return,
) -> None:
"""Run test for service turn_on/turn_off."""
@@ -323,13 +322,13 @@ async def test_fan_service_turn(
},
],
)
-async def test_service_fan_update(hass: HomeAssistant, mock_modbus, mock_ha) -> None:
+async def test_service_fan_update(hass: HomeAssistant, mock_modbus_ha) -> None:
"""Run test for service homeassistant.update_entity."""
await hass.services.async_call(
"homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
)
assert hass.states.get(ENTITY_ID).state == STATE_OFF
- mock_modbus.read_coils.return_value = ReadResult([0x01])
+ mock_modbus_ha.read_coils.return_value = ReadResult([0x01])
await hass.services.async_call(
"homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
)
diff --git a/tests/components/modbus/test_init.py b/tests/components/modbus/test_init.py
index 1219a04fb0c9dcfd1d09c47eae4be75893ee0406..82c65576f02037b0158f62c7f093b0b70879f3c6 100644
--- a/tests/components/modbus/test_init.py
+++ b/tests/components/modbus/test_init.py
@@ -1366,7 +1366,6 @@ async def mock_modbus_read_pymodbus_fixture(
do_type,
do_scan_interval,
do_return,
- do_exception,
caplog,
mock_pymodbus,
freezer: FrozenDateTimeFactory,
@@ -1374,10 +1373,6 @@ async def mock_modbus_read_pymodbus_fixture(
"""Load integration modbus using mocked pymodbus."""
caplog.clear()
caplog.set_level(logging.ERROR)
- mock_pymodbus.read_coils.side_effect = do_exception
- mock_pymodbus.read_discrete_inputs.side_effect = do_exception
- mock_pymodbus.read_input_registers.side_effect = do_exception
- mock_pymodbus.read_holding_registers.side_effect = do_exception
mock_pymodbus.read_coils.return_value = do_return
mock_pymodbus.read_discrete_inputs.return_value = do_return
mock_pymodbus.read_input_registers.return_value = do_return
@@ -1646,7 +1641,7 @@ async def test_shutdown(
],
)
async def test_stop_restart(
- hass: HomeAssistant, caplog: pytest.LogCaptureFixture, mock_pymodbus_return
+ hass: HomeAssistant, caplog: pytest.LogCaptureFixture, mock_modbus
) -> None:
"""Run test for service stop."""
@@ -1657,7 +1652,7 @@ async def test_stop_restart(
await hass.async_block_till_done()
assert hass.states.get(entity_id).state == "17"
- mock_pymodbus_return.reset_mock()
+ mock_modbus.reset_mock()
caplog.clear()
data = {
ATTR_HUB: TEST_MODBUS_NAME,
@@ -1665,23 +1660,23 @@ async def test_stop_restart(
await hass.services.async_call(DOMAIN, SERVICE_STOP, data, blocking=True)
await hass.async_block_till_done()
assert hass.states.get(entity_id).state == STATE_UNAVAILABLE
- assert mock_pymodbus_return.close.called
+ assert mock_modbus.close.called
assert f"modbus {TEST_MODBUS_NAME} communication closed" in caplog.text
- mock_pymodbus_return.reset_mock()
+ mock_modbus.reset_mock()
caplog.clear()
await hass.services.async_call(DOMAIN, SERVICE_RESTART, data, blocking=True)
await hass.async_block_till_done()
- assert not mock_pymodbus_return.close.called
- assert mock_pymodbus_return.connect.called
+ assert not mock_modbus.close.called
+ assert mock_modbus.connect.called
assert f"modbus {TEST_MODBUS_NAME} communication open" in caplog.text
- mock_pymodbus_return.reset_mock()
+ mock_modbus.reset_mock()
caplog.clear()
await hass.services.async_call(DOMAIN, SERVICE_RESTART, data, blocking=True)
await hass.async_block_till_done()
- assert mock_pymodbus_return.close.called
- assert mock_pymodbus_return.connect.called
+ assert mock_modbus.close.called
+ assert mock_modbus.connect.called
assert f"modbus {TEST_MODBUS_NAME} communication closed" in caplog.text
assert f"modbus {TEST_MODBUS_NAME} communication open" in caplog.text
@@ -1711,7 +1706,7 @@ async def test_write_no_client(hass: HomeAssistant, mock_modbus) -> None:
async def test_integration_reload(
hass: HomeAssistant,
caplog: pytest.LogCaptureFixture,
- mock_pymodbus_return,
+ mock_modbus,
freezer: FrozenDateTimeFactory,
) -> None:
"""Run test for integration reload."""
@@ -1732,7 +1727,7 @@ async def test_integration_reload(
@pytest.mark.parametrize("do_config", [{}])
async def test_integration_reload_failed(
- hass: HomeAssistant, caplog: pytest.LogCaptureFixture, mock_pymodbus_return
+ hass: HomeAssistant, caplog: pytest.LogCaptureFixture, mock_modbus
) -> None:
"""Run test for integration connect failure on reload."""
caplog.set_level(logging.INFO)
@@ -1741,9 +1736,7 @@ async def test_integration_reload_failed(
yaml_path = get_fixture_path("configuration.yaml", "modbus")
with (
mock.patch.object(hass_config, "YAML_CONFIG_FILE", yaml_path),
- mock.patch.object(
- mock_pymodbus_return, "connect", side_effect=ModbusException("error")
- ),
+ mock.patch.object(mock_modbus, "connect", side_effect=ModbusException("error")),
):
await hass.services.async_call(DOMAIN, SERVICE_RELOAD, blocking=True)
await hass.async_block_till_done()
@@ -1754,7 +1747,7 @@ async def test_integration_reload_failed(
@pytest.mark.parametrize("do_config", [{}])
async def test_integration_setup_failed(
- hass: HomeAssistant, caplog: pytest.LogCaptureFixture, mock_pymodbus_return
+ hass: HomeAssistant, caplog: pytest.LogCaptureFixture, mock_modbus
) -> None:
"""Run test for integration setup on reload."""
with mock.patch.object(
diff --git a/tests/components/modbus/test_light.py b/tests/components/modbus/test_light.py
index e5e1b56d77b64038da3dc0f9528aa03ed9948e11..e74da085180e12dd720e54c67a1363abc0359192 100644
--- a/tests/components/modbus/test_light.py
+++ b/tests/components/modbus/test_light.py
@@ -262,7 +262,6 @@ async def test_light_service_turn(
hass: HomeAssistant,
caplog: pytest.LogCaptureFixture,
mock_modbus,
- mock_pymodbus_return,
) -> None:
"""Run test for service turn_on/turn_off."""
@@ -300,12 +299,6 @@ async def test_light_service_turn(
)
await hass.async_block_till_done()
assert hass.states.get(ENTITY_ID2).state == STATE_UNAVAILABLE
- mock_modbus.write_coil.side_effect = ModbusException("fail write_")
- await hass.services.async_call(
- "light", "turn_off", service_data={"entity_id": ENTITY_ID}
- )
- await hass.async_block_till_done()
- assert hass.states.get(ENTITY_ID).state == STATE_UNAVAILABLE
@pytest.mark.parametrize(
@@ -323,13 +316,13 @@ async def test_light_service_turn(
},
],
)
-async def test_service_light_update(hass: HomeAssistant, mock_modbus, mock_ha) -> None:
+async def test_service_light_update(hass: HomeAssistant, mock_modbus_ha) -> None:
"""Run test for service homeassistant.update_entity."""
await hass.services.async_call(
"homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
)
assert hass.states.get(ENTITY_ID).state == STATE_OFF
- mock_modbus.read_coils.return_value = ReadResult([0x01])
+ mock_modbus_ha.read_coils.return_value = ReadResult([0x01])
await hass.services.async_call(
"homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
)
diff --git a/tests/components/modbus/test_sensor.py b/tests/components/modbus/test_sensor.py
index 524acc0dabbddfc4a481263a624b8e6efe858c2f..71cb64cc1b65ad431fde49e43e55c9f12618f219 100644
--- a/tests/components/modbus/test_sensor.py
+++ b/tests/components/modbus/test_sensor.py
@@ -1391,14 +1391,14 @@ async def test_restore_state_sensor(
},
],
)
-async def test_service_sensor_update(hass: HomeAssistant, mock_modbus, mock_ha) -> None:
+async def test_service_sensor_update(hass: HomeAssistant, mock_modbus_ha) -> None:
"""Run test for service homeassistant.update_entity."""
- mock_modbus.read_input_registers.return_value = ReadResult([27])
+ mock_modbus_ha.read_input_registers.return_value = ReadResult([27])
await hass.services.async_call(
"homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
)
assert hass.states.get(ENTITY_ID).state == "27"
- mock_modbus.read_input_registers.return_value = ReadResult([32])
+ mock_modbus_ha.read_input_registers.return_value = ReadResult([32])
await hass.services.async_call(
"homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
)
diff --git a/tests/components/modbus/test_switch.py b/tests/components/modbus/test_switch.py
index 4eb0a5b3a1866c1d534b9992a905e2b181479dbf..bdb95c667c765f07c19cde264964d1f381939cd9 100644
--- a/tests/components/modbus/test_switch.py
+++ b/tests/components/modbus/test_switch.py
@@ -277,7 +277,6 @@ async def test_switch_service_turn(
hass: HomeAssistant,
caplog: pytest.LogCaptureFixture,
mock_modbus,
- mock_pymodbus_return,
) -> None:
"""Run test for service turn_on/turn_off."""
assert MODBUS_DOMAIN in hass.config.components
@@ -337,13 +336,13 @@ async def test_switch_service_turn(
},
],
)
-async def test_service_switch_update(hass: HomeAssistant, mock_modbus, mock_ha) -> None:
+async def test_service_switch_update(hass: HomeAssistant, mock_modbus_ha) -> None:
"""Run test for service homeassistant.update_entity."""
await hass.services.async_call(
"homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
)
assert hass.states.get(ENTITY_ID).state == STATE_OFF
- mock_modbus.read_coils.return_value = ReadResult([0x01])
+ mock_modbus_ha.read_coils.return_value = ReadResult([0x01])
await hass.services.async_call(
"homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
)
@@ -368,9 +367,7 @@ async def test_service_switch_update(hass: HomeAssistant, mock_modbus, mock_ha)
},
],
)
-async def test_delay_switch(
- hass: HomeAssistant, mock_modbus, mock_pymodbus_return
-) -> None:
+async def test_delay_switch(hass: HomeAssistant, mock_modbus) -> None:
"""Run test for switch verify delay."""
mock_modbus.read_holding_registers.return_value = ReadResult([0x01])
now = dt_util.utcnow()