Bump version

Author: MatthewFlamm

README.md

@@ -1,6 +1,6 @@
 # pytest-homeassistant-custom-component
 
-![HA core version](https://img.shields.io/static/v1?label=HA+core+version&message=2023.11.3&labelColor=blue)
+![HA core version](https://img.shields.io/static/v1?label=HA+core+version&message=2023.12.0b0&labelColor=blue)
 
 [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/MatthewFlamm/pytest-homeassistant-custom-component)
 

ha_version

@@ -1 +1 @@
-2023.11.3
+2023.12.0b0

requirements_dev.txt

@@ -1,6 +1,6 @@
 # This file is originally from homeassistant/core and modified by pytest-homeassistant-custom-component.
 astroid==3.0.1
-mypy==1.6.1
+mypy==1.7.1
 pre-commit==3.5.0
 pylint==3.0.2
 types-aiofiles==23.2.0.0

requirements_test.txt

@@ -23,15 +23,15 @@ pytest-test-groups==1.0.3
 pytest-sugar==0.9.7
 pytest-timeout==2.1.0
 pytest-unordered==0.5.2
-pytest-picked==0.4.6
+pytest-picked==0.5.0
 pytest-xdist==3.3.1
 pytest==7.4.3
 requests-mock==1.11.0
 respx==0.20.2
-syrupy==4.5.0
+syrupy==4.6.0
 tqdm==4.66.1
-homeassistant==2023.11.3
-SQLAlchemy==2.0.22
+homeassistant==2023.12.0b0
+SQLAlchemy==2.0.23
 
 paho-mqtt==1.6.1
 

src/pytest_homeassistant_custom_component/common.py

@@ -272,7 +272,7 @@ def async_create_task(coroutine, name=None):
             "homeassistant.helpers.restore_state.RestoreStateData.async_setup_dump",
             return_value=None,
         ), patch(
-            "homeassistant.helpers.restore_state.start.async_at_start"
+            "homeassistant.helpers.restore_state.start.async_at_start",
         ):
             await asyncio.gather(
                 ar.async_load(hass),
@@ -302,6 +302,7 @@ def async_mock_service(
     schema: vol.Schema | None = None,
     response: ServiceResponse = None,
     supports_response: SupportsResponse | None = None,
+    raise_exception: Exception | None = None,
 ) -> list[ServiceCall]:
     """Set up a fake service & return a calls log list to this service."""
     calls = []
@@ -310,10 +311,15 @@ def async_mock_service(
     def mock_service_log(call):  # pylint: disable=unnecessary-lambda
         """Mock service call."""
         calls.append(call)
+        if raise_exception is not None:
+            raise raise_exception
         return response
 
-    if supports_response is None and response is not None:
-        supports_response = SupportsResponse.OPTIONAL
+    if supports_response is None:
+        if response is not None:
+            supports_response = SupportsResponse.OPTIONAL
+        else:
+            supports_response = SupportsResponse.NONE
 
     hass.services.async_register(
         domain,
@@ -987,15 +993,18 @@ def assert_setup_component(count, domain=None):
     async def mock_psc(hass, config_input, integration):
         """Mock the prepare_setup_component to capture config."""
         domain_input = integration.domain
-        res = await async_process_component_config(hass, config_input, integration)
+        integration_config_info = await async_process_component_config(
+            hass, config_input, integration
+        )
+        res = integration_config_info.config
         config[domain_input] = None if res is None else res.get(domain_input)
         _LOGGER.debug(
             "Configuration for %s, Validated: %s, Original %s",
             domain_input,
             config[domain_input],
             config_input.get(domain_input),
         )
-        return res
+        return integration_config_info
 
     assert isinstance(config, dict)
     with patch("homeassistant.config.async_process_component_config", mock_psc):
@@ -1304,11 +1313,12 @@ async def get_system_health_info(hass: HomeAssistant, domain: str) -> dict[str,
 @contextmanager
 def mock_config_flow(domain: str, config_flow: type[ConfigFlow]) -> None:
     """Mock a config flow handler."""
-    assert domain not in config_entries.HANDLERS
+    handler = config_entries.HANDLERS.get(domain)
     config_entries.HANDLERS[domain] = config_flow
     _LOGGER.info("Adding mock config flow: %s", domain)
     yield
-    config_entries.HANDLERS.pop(domain)
+    if handler:
+        config_entries.HANDLERS[domain] = handler
 
 
 def mock_integration(
@@ -1342,18 +1352,6 @@ def mock_import_platform(platform_name: str) -> NoReturn:
     return integration
 
 
-def mock_entity_platform(
-    hass: HomeAssistant, platform_path: str, module: MockPlatform | None
-) -> None:
-    """Mock a entity platform.
-
-    platform_path is in form light.hue. Will create platform
-    hue.light.
-    """
-    domain, platform_name = platform_path.split(".")
-    mock_platform(hass, f"{platform_name}.{domain}", module)
-
-
 def mock_platform(
     hass: HomeAssistant, platform_path: str, module: Mock | MockPlatform | None = None
 ) -> None:

src/pytest_homeassistant_custom_component/components/recorder/common.py

@@ -416,17 +416,11 @@ def old_db_schema(schema_version_postfix: str) -> Iterator[None]:
         recorder.migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION
     ), patch.object(core, "StatesMeta", old_db_schema.StatesMeta), patch.object(
         core, "EventTypes", old_db_schema.EventTypes
-    ), patch.object(
-        core, "EventData", old_db_schema.EventData
-    ), patch.object(
+    ), patch.object(core, "EventData", old_db_schema.EventData), patch.object(
         core, "States", old_db_schema.States
-    ), patch.object(
-        core, "Events", old_db_schema.Events
-    ), patch.object(
+    ), patch.object(core, "Events", old_db_schema.Events), patch.object(
         core, "StateAttributes", old_db_schema.StateAttributes
-    ), patch.object(
-        core, "EntityIDMigrationTask", core.RecorderTask
-    ), patch(
+    ), patch.object(core, "EntityIDMigrationTask", core.RecorderTask), patch(
         CREATE_ENGINE_TARGET,
         new=partial(
             create_engine_test_for_schema_version_postfix,

src/pytest_homeassistant_custom_component/const.py

@@ -10,8 +10,8 @@
 
 APPLICATION_NAME: Final = "HomeAssistant"
 MAJOR_VERSION: Final = 2023
-MINOR_VERSION: Final = 11
-PATCH_VERSION: Final = "3"
+MINOR_VERSION: Final = 12
+PATCH_VERSION: Final = "0b0"
 __short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__: Final = f"{__short_version__}.{PATCH_VERSION}"
 REQUIRED_PYTHON_VER: Final[tuple[int, int, int]] = (3, 11, 0)

src/pytest_homeassistant_custom_component/plugins.py

@@ -1149,13 +1149,19 @@ def mock_zeroconf() -> Generator[None, None, None]:
 @pytest.fixture
 def mock_async_zeroconf(mock_zeroconf: None) -> Generator[None, None, None]:
     """Mock AsyncZeroconf."""
-    from zeroconf import DNSCache  # pylint: disable=import-outside-toplevel
+    from zeroconf import DNSCache, Zeroconf  # pylint: disable=import-outside-toplevel
+    from zeroconf.asyncio import (  # pylint: disable=import-outside-toplevel
+        AsyncZeroconf,
+    )
 
-    with patch("homeassistant.components.zeroconf.HaAsyncZeroconf") as mock_aiozc:
+    with patch(
+        "homeassistant.components.zeroconf.HaAsyncZeroconf", spec=AsyncZeroconf
+    ) as mock_aiozc:
         zc = mock_aiozc.return_value
         zc.async_unregister_service = AsyncMock()
         zc.async_register_service = AsyncMock()
         zc.async_update_service = AsyncMock()
+        zc.zeroconf = Mock(spec=Zeroconf)
         zc.zeroconf.async_wait_for_start = AsyncMock()
         # DNSCache has strong Cython type checks, and MagicMock does not work
         # so we must mock the class directly

src/pytest_homeassistant_custom_component/test_util/__init__.py

@@ -1,5 +1,39 @@
 """
-Tests for the test utilities.
+Test utilities.
 
 This file is originally from homeassistant/core and modified by pytest-homeassistant-custom-component.
 """
+from collections.abc import Awaitable, Callable
+
+from aiohttp.web import Application, Request, StreamResponse, middleware
+
+
+def mock_real_ip(app: Application) -> Callable[[str], None]:
+    """Inject middleware to mock real IP.
+
+    Returns a function to set the real IP.
+    """
+    ip_to_mock: str | None = None
+
+    def set_ip_to_mock(value: str):
+        nonlocal ip_to_mock
+        ip_to_mock = value
+
+    @middleware
+    async def mock_real_ip(
+        request: Request, handler: Callable[[Request], Awaitable[StreamResponse]]
+    ) -> StreamResponse:
+        """Mock Real IP middleware."""
+        nonlocal ip_to_mock
+
+        request = request.clone(remote=ip_to_mock)
+
+        return await handler(request)
+
+    async def real_ip_startup(app):
+        """Startup of real ip."""
+        app.middlewares.insert(0, mock_real_ip)
+
+    app.on_startup.append(real_ip_startup)
+
+    return set_ip_to_mock

src/pytest_homeassistant_custom_component/test_util/aiohttp.py

@@ -11,7 +11,11 @@
 from urllib.parse import parse_qs
 
 from aiohttp import ClientSession
-from aiohttp.client_exceptions import ClientError, ClientResponseError
+from aiohttp.client_exceptions import (
+    ClientConnectionError,
+    ClientError,
+    ClientResponseError,
+)
 from aiohttp.streams import StreamReader
 from multidict import CIMultiDict
 from yarl import URL
@@ -57,6 +61,7 @@ def request(
         exc=None,
         cookies=None,
         side_effect=None,
+        closing=None,
     ):
         """Mock a request."""
         if not isinstance(url, RETYPE):
@@ -76,6 +81,7 @@ def request(
                 exc=exc,
                 headers=headers,
                 side_effect=side_effect,
+                closing=closing,
             )
         )
 
@@ -169,6 +175,7 @@ def __init__(
         exc=None,
         headers=None,
         side_effect=None,
+        closing=None,
     ):
         """Initialize a fake response."""
         if json is not None:
@@ -182,9 +189,10 @@ def __init__(
         self.method = method
         self._url = url
         self.status = status
-        self.response = response
+        self._response = response
         self.exc = exc
         self.side_effect = side_effect
+        self.closing = closing
         self._headers = CIMultiDict(headers or {})
         self._cookies = {}
 
@@ -276,6 +284,19 @@ def raise_for_status(self):
     def close(self):
         """Mock close."""
 
+    async def wait_for_close(self):
+        """Wait until all requests are done.
+
+        Do nothing as we are mocking.
+        """
+
+    @property
+    def response(self):
+        """Property method to expose the response to other read methods."""
+        if self.closing:
+            raise ClientConnectionError("Connection closed")
+        return self._response
+
 
 @contextmanager
 def mock_aiohttp_client():