Address late KNX flow tests review (#83208)

* Address late KNX flow tests review

* Update tests/components/knx/test_config_flow.py

Co-authored-by: Martin Hjelmare <marhje52@gmail.com>

Co-authored-by: Martin Hjelmare <marhje52@gmail.com>
This commit is contained in:
Matthias Alphart 2022-12-04 18:39:27 +01:00 committed by GitHub
parent cefdce5002
commit 4ca6db825c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
"""Test the KNX config flow.""" """Test the KNX config flow."""
from unittest.mock import Mock, patch from unittest.mock import patch
import pytest import pytest
from xknx.exceptions.exception import CommunicationError, InvalidSecureConfiguration from xknx.exceptions.exception import CommunicationError, InvalidSecureConfiguration
@ -45,7 +45,7 @@ from homeassistant.data_entry_flow import FlowResult, FlowResultType
from tests.common import MockConfigEntry from tests.common import MockConfigEntry
@pytest.fixture(name="knx_setup", autouse=True) @pytest.fixture(name="knx_setup")
def fixture_knx_setup(): def fixture_knx_setup():
"""Mock KNX entry setup.""" """Mock KNX entry setup."""
with patch("homeassistant.components.knx.async_setup", return_value=True), patch( with patch("homeassistant.components.knx.async_setup", return_value=True), patch(
@ -1063,14 +1063,15 @@ async def test_configure_secure_knxkeys_invalid_signature(hass: HomeAssistant):
async def test_options_flow_connection_type( async def test_options_flow_connection_type(
hass: HomeAssistant, knx_setup, mock_config_entry: MockConfigEntry hass: HomeAssistant, knx, mock_config_entry: MockConfigEntry
) -> None: ) -> None:
"""Test options flow changing interface.""" """Test options flow changing interface."""
mock_config_entry.add_to_hass(hass) # run one option flow test with a set up integration (knx fixture)
# instead of mocking async_setup_entry (knx_setup fixture) to test
# usage of the already running XKNX instance for gateway scanner
gateway = _gateway_descriptor("192.168.0.1", 3675) gateway = _gateway_descriptor("192.168.0.1", 3675)
await hass.config_entries.async_setup(mock_config_entry.entry_id) await knx.setup_integration({})
hass.data[DOMAIN] = Mock() # GatewayScanner uses running XKNX() in options flow
menu_step = await hass.config_entries.options.async_init(mock_config_entry.entry_id) menu_step = await hass.config_entries.options.async_init(mock_config_entry.entry_id)
with patch( with patch(
@ -1114,7 +1115,6 @@ async def test_options_flow_connection_type(
CONF_KNX_STATE_UPDATER: CONF_KNX_DEFAULT_STATE_UPDATER, CONF_KNX_STATE_UPDATER: CONF_KNX_DEFAULT_STATE_UPDATER,
CONF_KNX_ROUTE_BACK: False, CONF_KNX_ROUTE_BACK: False,
} }
knx_setup.assert_called_once()
async def test_options_flow_secure_manual_to_keyfile( async def test_options_flow_secure_manual_to_keyfile(