Fix addon_stats and broken tests

Author: mdegat01

homeassistant/components/hassio/coordinator.py

@@ -364,7 +364,7 @@ async def _async_update_data(self) -> dict[str, Any]:
         new_data[DATA_KEY_ADDONS] = {
             slug: {
                 **addon,
-                **addons_stats.get(slug, {}),
+                **(addons_stats.get(slug) or {}),
                 ATTR_REPOSITORY: repositories.get(
                     repo_slug := addon.get(ATTR_REPOSITORY, ""), repo_slug
                 ),

tests/components/hassio/test_sensor.py

@@ -48,7 +48,11 @@ def mock_all(
     supervisor_stats: AsyncMock,
 ) -> None:
     """Mock all setup requests."""
-    _install_default_mocks(aioclient_mock)
+    aioclient_mock.post("http://127.0.0.1/homeassistant/options", json={"result": "ok"})
+    aioclient_mock.post("http://127.0.0.1/supervisor/options", json={"result": "ok"})
+    aioclient_mock.get(
+        "http://127.0.0.1/ingress/panels", json={"result": "ok", "data": {"panels": {}}}
+    )
 
     host_info.return_value = replace(host_info.return_value, agent_version="1.0.0")
     addons_list.return_value[1] = replace(
@@ -82,15 +86,6 @@ def mock_addon_info(slug: str):
     addon_installed.side_effect = mock_addon_info
 
 
-def _install_default_mocks(aioclient_mock: AiohttpClientMocker):
-    """Install default mocks."""
-    aioclient_mock.post("http://127.0.0.1/homeassistant/options", json={"result": "ok"})
-    aioclient_mock.post("http://127.0.0.1/supervisor/options", json={"result": "ok"})
-    aioclient_mock.get(
-        "http://127.0.0.1/ingress/panels", json={"result": "ok", "data": {"panels": {}}}
-    )
-
-
 @pytest.mark.parametrize(
     ("store_addons", "store_repositories"), [(MOCK_STORE_ADDONS, MOCK_REPOSITORIES)]
 )
@@ -187,20 +182,14 @@ async def test_stats_addon_sensor(
     # Verify that the entity is disabled by default.
     assert hass.states.get(entity_id) is None
 
-    aioclient_mock.clear_requests()
-    _install_default_mocks(aioclient_mock)
     addon_stats.side_effect = SupervisorError
-
     freezer.tick(HASSIO_UPDATE_INTERVAL + timedelta(seconds=1))
     async_fire_time_changed(hass)
     await hass.async_block_till_done(wait_background_tasks=True)
 
     assert "Could not fetch stats" not in caplog.text
 
-    aioclient_mock.clear_requests()
-    _install_default_mocks(aioclient_mock)
     addon_stats.side_effect = None
-
     freezer.tick(HASSIO_UPDATE_INTERVAL + timedelta(seconds=1))
     async_fire_time_changed(hass)
     await hass.async_block_till_done(wait_background_tasks=True)
@@ -230,10 +219,7 @@ async def test_stats_addon_sensor(
     state = hass.states.get(entity_id)
     assert state.state == expected
 
-    aioclient_mock.clear_requests()
-    _install_default_mocks(aioclient_mock)
     addon_stats.side_effect = SupervisorError
-
     freezer.tick(HASSIO_UPDATE_INTERVAL + timedelta(seconds=1))
     async_fire_time_changed(hass)
     await hass.async_block_till_done(wait_background_tasks=True)

tests/components/http/test_ban.py

@@ -245,14 +245,13 @@ async def test_ip_ban_manager_never_started(
         )
     ),
 )
+@pytest.mark.usefixtures("hassio_env", "resolution_info", "os_info")
 async def test_access_from_supervisor_ip(
     remote_addr,
     bans,
     status,
     hass: HomeAssistant,
     aiohttp_client: ClientSessionGenerator,
-    hassio_env,
-    resolution_info: AsyncMock,
 ) -> None:
     """Test accessing to server from supervisor IP."""
     app = web.Application()

tests/components/onboarding/test_views.py

@@ -2,6 +2,7 @@
 
 import asyncio
 from collections.abc import AsyncGenerator
+from dataclasses import replace
 from http import HTTPStatus
 import os
 from typing import Any
@@ -54,15 +55,14 @@ async def rpi_fixture(
 
 @pytest.fixture(name="no_rpi")
 async def no_rpi_fixture(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, mock_supervisor
+    hass: HomeAssistant,
+    aioclient_mock: AiohttpClientMocker,
+    homeassistant_info: AsyncMock,
+    mock_supervisor,
 ) -> None:
     """Mock core info with rpi."""
-    aioclient_mock.get(
-        "http://127.0.0.1/core/info",
-        json={
-            "result": "ok",
-            "data": {"version_latest": "1.0.0", "machine": "odroid-n2"},
-        },
+    homeassistant_info.return_value = replace(
+        homeassistant_info.return_value, machine="odroid-n2"
     )
     assert await async_setup_component(hass, "hassio", {})
     await hass.async_block_till_done()
@@ -74,38 +74,20 @@ async def mock_supervisor_fixture(
     store_info: AsyncMock,
     supervisor_is_connected: AsyncMock,
     resolution_info: AsyncMock,
+    supervisor_root_info: AsyncMock,
+    host_info: AsyncMock,
+    supervisor_info: AsyncMock,
+    network_info: AsyncMock,
+    os_info: AsyncMock,
 ) -> AsyncGenerator[None]:
     """Mock supervisor."""
     aioclient_mock.post("http://127.0.0.1/homeassistant/options", json={"result": "ok"})
     aioclient_mock.post("http://127.0.0.1/supervisor/options", json={"result": "ok"})
-    aioclient_mock.get(
-        "http://127.0.0.1/network/info",
-        json={
-            "result": "ok",
-            "data": {
-                "host_internet": True,
-                "supervisor_internet": True,
-            },
-        },
+    supervisor_info.return_value = replace(
+        supervisor_info.return_value, diagnostics=True
     )
     with (
         patch.dict(os.environ, {"SUPERVISOR": "127.0.0.1"}),
-        patch(
-            "homeassistant.components.hassio.HassIO.get_info",
-            return_value={},
-        ),
-        patch(
-            "homeassistant.components.hassio.HassIO.get_host_info",
-            return_value={},
-        ),
-        patch(
-            "homeassistant.components.hassio.HassIO.get_supervisor_info",
-            return_value={"diagnostics": True},
-        ),
-        patch(
-            "homeassistant.components.hassio.HassIO.get_os_info",
-            return_value={},
-        ),
         patch(
             "homeassistant.components.hassio.HassIO.get_ingress_panels",
             return_value={"panels": {}},