Create and use config_entry fixture for Axis integration tests (home-assistant#85865)

Author: Kane610

tests/components/axis/conftest.py

@@ -6,8 +6,83 @@
 from axis.rtsp import Signal, State
 import pytest
 
+from homeassistant.components.axis.const import CONF_EVENTS, DOMAIN as AXIS_DOMAIN
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_MODEL,
+    CONF_NAME,
+    CONF_PASSWORD,
+    CONF_PORT,
+    CONF_USERNAME,
+)
+
+from tests.common import MockConfigEntry
 from tests.components.light.conftest import mock_light_profiles  # noqa: F401
 
+MAC = "00408C123456"
+FORMATTED_MAC = "00:40:8c:12:34:56"
+MODEL = "model"
+NAME = "name"
+
+DEFAULT_HOST = "1.2.3.4"
+
+ENTRY_OPTIONS = {CONF_EVENTS: True}
+
+ENTRY_CONFIG = {
+    CONF_HOST: DEFAULT_HOST,
+    CONF_USERNAME: "root",
+    CONF_PASSWORD: "pass",
+    CONF_PORT: 80,
+    CONF_MODEL: MODEL,
+    CONF_NAME: NAME,
+}
+
+
+@pytest.fixture(name="config_entry")
+def config_entry_fixture(hass, config, options, config_entry_version):
+    """Define a config entry fixture."""
+    entry = MockConfigEntry(
+        domain=AXIS_DOMAIN,
+        unique_id=FORMATTED_MAC,
+        data=config,
+        options=options,
+        version=config_entry_version,
+    )
+    entry.add_to_hass(hass)
+    return entry
+
+
+@pytest.fixture(name="config_entry_version")
+def config_entry_version_fixture(request):
+    """Define a config entry version fixture.
+
+    @pytest.mark.config_entry_version(int)
+    """
+    marker = request.node.get_closest_marker("config_entry_version")
+    version = 3
+    if marker:
+        version = marker.args[0]
+    return version
+
+
+@pytest.fixture(name="config")
+def config_fixture():
+    """Define a config entry data fixture."""
+    return ENTRY_CONFIG.copy()
+
+
+@pytest.fixture(name="options")
+def options_fixture(request):
+    """Define a config entry options fixture.
+
+    @pytest.mark.config_entry_options(dict)
+    """
+    marker = request.node.get_closest_marker("config_entry_options")
+    options = ENTRY_OPTIONS.copy()
+    if marker:
+        options = marker.args[0]
+    return options
+
 
 @pytest.fixture(autouse=True)
 def mock_axis_rtspclient():

tests/components/axis/test_binary_sensor.py

@@ -8,7 +8,8 @@
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.setup import async_setup_component
 
-from .test_device import NAME, setup_axis_integration
+from .conftest import NAME
+from .test_device import setup_axis_integration
 
 
 async def test_platform_manually_configured(hass):
@@ -25,16 +26,16 @@ async def test_platform_manually_configured(hass):
     assert AXIS_DOMAIN not in hass.data
 
 
-async def test_no_binary_sensors(hass):
+async def test_no_binary_sensors(hass, config_entry):
     """Test that no sensors in Axis results in no sensor entities."""
-    await setup_axis_integration(hass)
+    await setup_axis_integration(hass, config_entry)
 
     assert not hass.states.async_entity_ids(BINARY_SENSOR_DOMAIN)
 
 
-async def test_binary_sensors(hass, mock_rtsp_event):
+async def test_binary_sensors(hass, config_entry, mock_rtsp_event):
     """Test that sensors are loaded properly."""
-    await setup_axis_integration(hass)
+    await setup_axis_integration(hass, config_entry)
 
     mock_rtsp_event(
         topic="tns1:Device/tnsaxis:Sensor/PIR",

tests/components/axis/test_camera.py

@@ -2,6 +2,8 @@
 
 from unittest.mock import patch
 
+import pytest
+
 from homeassistant.components import camera
 from homeassistant.components.axis.const import (
     CONF_STREAM_PROFILE,
@@ -11,7 +13,8 @@
 from homeassistant.const import STATE_IDLE
 from homeassistant.setup import async_setup_component
 
-from .test_device import ENTRY_OPTIONS, NAME, setup_axis_integration
+from .conftest import NAME
+from .test_device import setup_axis_integration
 
 
 async def test_platform_manually_configured(hass):
@@ -26,9 +29,9 @@ async def test_platform_manually_configured(hass):
     assert AXIS_DOMAIN not in hass.data
 
 
-async def test_camera(hass):
+async def test_camera(hass, config_entry):
     """Test that Axis camera platform is loaded properly."""
-    await setup_axis_integration(hass)
+    await setup_axis_integration(hass, config_entry)
 
     assert len(hass.states.async_entity_ids(CAMERA_DOMAIN)) == 1
 
@@ -47,10 +50,10 @@ async def test_camera(hass):
     )
 
 
-async def test_camera_with_stream_profile(hass):
+@pytest.mark.config_entry_options({CONF_STREAM_PROFILE: "profile_1"})
+async def test_camera_with_stream_profile(hass, config_entry):
     """Test that Axis camera entity is using the correct path with stream profike."""
-    with patch.dict(ENTRY_OPTIONS, {CONF_STREAM_PROFILE: "profile_1"}):
-        await setup_axis_integration(hass)
+    await setup_axis_integration(hass, config_entry)
 
     assert len(hass.states.async_entity_ids(CAMERA_DOMAIN)) == 1
 
@@ -72,9 +75,9 @@ async def test_camera_with_stream_profile(hass):
     )
 
 
-async def test_camera_disabled(hass):
+async def test_camera_disabled(hass, config_entry):
     """Test that Axis camera platform is loaded properly but does not create camera entity."""
     with patch("axis.vapix.vapix.Params.image_format", new=None):
-        await setup_axis_integration(hass)
+        await setup_axis_integration(hass, config_entry)
 
     assert len(hass.states.async_entity_ids(CAMERA_DOMAIN)) == 0

tests/components/axis/test_config_flow.py

@@ -32,14 +32,8 @@
 )
 from homeassistant.data_entry_flow import FlowResultType
 
-from .test_device import (
-    DEFAULT_HOST,
-    MAC,
-    MODEL,
-    NAME,
-    mock_default_vapix_requests,
-    setup_axis_integration,
-)
+from .conftest import DEFAULT_HOST, MAC, MODEL, NAME
+from .test_device import mock_default_vapix_requests, setup_axis_integration
 
 from tests.common import MockConfigEntry
 
@@ -79,9 +73,9 @@ async def test_flow_manual_configuration(hass):
     }
 
 
-async def test_manual_configuration_update_configuration(hass):
+async def test_manual_configuration_update_configuration(hass, config_entry):
     """Test that config flow fails on already configured device."""
-    config_entry = await setup_axis_integration(hass)
+    await setup_axis_integration(hass, config_entry)
     device = hass.data[AXIS_DOMAIN][config_entry.entry_id]
 
     result = await hass.config_entries.flow.async_init(
@@ -211,9 +205,9 @@ async def test_flow_create_entry_multiple_existing_entries_of_same_model(hass):
     assert result["data"][CONF_NAME] == "M1065-LW 2"
 
 
-async def test_reauth_flow_update_configuration(hass):
+async def test_reauth_flow_update_configuration(hass, config_entry):
     """Test that config flow fails on already configured device."""
-    config_entry = await setup_axis_integration(hass)
+    await setup_axis_integration(hass, config_entry)
     device = hass.data[AXIS_DOMAIN][config_entry.entry_id]
 
     result = await hass.config_entries.flow.async_init(
@@ -383,10 +377,10 @@ async def test_discovery_flow(hass, source: str, discovery_info: dict):
     ],
 )
 async def test_discovered_device_already_configured(
-    hass, source: str, discovery_info: dict
+    hass, config_entry, source: str, discovery_info: dict
 ):
     """Test that discovery doesn't setup already configured devices."""
-    config_entry = await setup_axis_integration(hass)
+    await setup_axis_integration(hass, config_entry)
     assert config_entry.data[CONF_HOST] == DEFAULT_HOST
 
     result = await hass.config_entries.flow.async_init(
@@ -439,10 +433,10 @@ async def test_discovered_device_already_configured(
     ],
 )
 async def test_discovery_flow_updated_configuration(
-    hass, source: str, discovery_info: dict, expected_port: int
+    hass, config_entry, source: str, discovery_info: dict, expected_port: int
 ):
     """Test that discovery flow update configuration with new parameters."""
-    config_entry = await setup_axis_integration(hass)
+    await setup_axis_integration(hass, config_entry)
     assert config_entry.data == {
         CONF_HOST: DEFAULT_HOST,
         CONF_PORT: 80,
@@ -573,9 +567,9 @@ async def test_discovery_flow_ignore_link_local_address(
     assert result["reason"] == "link_local_address"
 
 
-async def test_option_flow(hass):
+async def test_option_flow(hass, config_entry):
     """Test config flow options."""
-    config_entry = await setup_axis_integration(hass)
+    await setup_axis_integration(hass, config_entry)
     device = hass.data[AXIS_DOMAIN][config_entry.entry_id]
     assert device.option_stream_profile == DEFAULT_STREAM_PROFILE
     assert device.option_video_source == DEFAULT_VIDEO_SOURCE