fix tests

Author: pail23

tests/conftest.py

@@ -19,7 +19,7 @@
 from unittest.mock import patch
 
 import pytest
-from pymodbus.pdu.register_read_message import (
+from pymodbus.pdu.register_message import (
     ReadHoldingRegistersResponse,
     ReadInputRegistersResponse,
 )
@@ -72,45 +72,46 @@ def bypass_get_data_fixture():
         yield
 
 
-def read_input_register(register, start, count) -> ReadInputRegistersResponse:
+def read_input_register(
+    address: int, register, start, count
+) -> ReadInputRegistersResponse:
     """Read a slice from the input register."""
-    return ReadInputRegistersResponse(register[start : start + count])
+    return ReadInputRegistersResponse(
+        address=address, count=count, registers=register[start : start + count]
+    )
 
 
 async def read_input_registers_wpm(
-    address: int,
-    count: int = 1,
-    slave: int = 0,
-    **kwargs: Any,
+    address: int, *, count: int = 1, slave: int = 0, no_response_expected: bool = False
 ):
     """Simulate reads on the input registers on wpm models."""
     system_info = [2, 390]
     if address >= 5000:
-        return read_input_register(system_info, address - 5000, count)
-    return ReadInputRegistersResponse(list(range(count)))
+        return read_input_register(address, system_info, address - 5000, count)
+    return ReadInputRegistersResponse(
+        address=address, count=count, registers=list(range(count))
+    )
 
 
 async def read_input_registers_lwz(
-    address: int,
-    count: int = 1,
-    slave: int = 0,
-    **kwargs: Any,
+    address: int, *, count: int = 1, slave: int = 0, no_response_expected: bool = False
 ):
     """Simulate reads on the input registers on lwz models ."""
     system_info = [2, 103]
     if address >= 5000:
-        return read_input_register(system_info, address - 5000, count)
-    return ReadInputRegistersResponse(list(range(count)))
+        return read_input_register(address, system_info, address - 5000, count)
+    return ReadInputRegistersResponse(
+        address=address, count=count, registers=list(range(count))
+    )
 
 
 async def read_holding_registers(
-    address: int,
-    count: int = 1,
-    slave: int = 0,
-    **kwargs: Any,
+    address: int, *, count: int = 1, slave: int = 0, no_response_expected: bool = False
 ):
     """Simulate reads on the holding registers on lwz models ."""
-    return ReadHoldingRegistersResponse(list(range(count)))
+    return ReadHoldingRegistersResponse(
+        address=address, count=count, registers=list(range(count))
+    )
 
 
 # This fixture, when used, will result in calls to read_input_registers to return mock data. To have the call

tests/test_config_flow.py

@@ -3,8 +3,9 @@
 from unittest.mock import patch
 
 import pytest
-from homeassistant import config_entries, data_entry_flow
+from homeassistant import config_entries
 from homeassistant.const import CONF_HOST
+from homeassistant.data_entry_flow import FlowResultType
 
 from custom_components.stiebel_eltron_isg.const import (
     DOMAIN,
@@ -45,7 +46,7 @@ async def test_successful_config_flow(hass, bypass_get_data):
     )
 
     # Check that the config flow shows the user form as the first step
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == FlowResultType.FORM
     assert result["step_id"] == "user"
 
     # If a user were to enter `test_username` for username and `test_password`
@@ -57,7 +58,7 @@ async def test_successful_config_flow(hass, bypass_get_data):
 
     # Check that the config flow is complete and a new entry is created with
     # the input data
-    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["type"] == FlowResultType.CREATE_ENTRY
     assert result["title"] == "Stiebel Eltron ISG"
     assert result["data"] == MOCK_CONFIG
     assert result["result"]
@@ -75,13 +76,13 @@ async def test_failed_config_flow(hass, error_on_get_data):
         context={"source": config_entries.SOURCE_USER},
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == FlowResultType.FORM
     assert result["step_id"] == "user"
 
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
         user_input=MOCK_INVALID_IP_CONFIG,
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == FlowResultType.FORM
     assert result["errors"] == {CONF_HOST: "invalid_host_IP"}

tests/test_init.py

@@ -50,7 +50,7 @@ async def test_setup_unload_and_reload_entry(
 @pytest.mark.asyncio()
 async def test_data_coordinator_wpm(hass: HomeAssistant, mock_modbus_wpm) -> None:
     """Test creating a data coordinator for wpm models."""
-    config_entry = MockConfigEntry(domain=DOMAIN, data=MOCK_CONFIG, entry_id="test_wpm")
+    config_entry = MockConfigEntry(domain=DOMAIN, data=MOCK_CONFIG, entry_id="test")
     config_entry.add_to_hass(hass)
 
     await hass.config_entries.async_setup(config_entry.entry_id)