diff --git a/homeassistant/components/hardkernel/__init__.py b/homeassistant/components/hardkernel/__init__.py index c81ad7860be..41e65ff8b5e 100644 --- a/homeassistant/components/hardkernel/__init__.py +++ b/homeassistant/components/hardkernel/__init__.py @@ -1,7 +1,7 @@ """The Hardkernel integration.""" from __future__ import annotations -from homeassistant.components.hassio import get_os_info +from homeassistant.components.hassio import get_os_info, is_hassio from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryNotReady @@ -9,6 +9,11 @@ from homeassistant.exceptions import ConfigEntryNotReady async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: """Set up a Hardkernel config entry.""" + if not is_hassio(hass): + # Not running under supervisor, Home Assistant may have been migrated + hass.async_create_task(hass.config_entries.async_remove(entry.entry_id)) + return False + if (os_info := get_os_info(hass)) is None: # The hassio integration has not yet fetched data from the supervisor raise ConfigEntryNotReady diff --git a/homeassistant/components/hardkernel/manifest.json b/homeassistant/components/hardkernel/manifest.json index 1b29f0b0b22..2a528a5173e 100644 --- a/homeassistant/components/hardkernel/manifest.json +++ b/homeassistant/components/hardkernel/manifest.json @@ -1,9 +1,10 @@ { "domain": "hardkernel", "name": "Hardkernel", + "after_dependencies": ["hassio"], "codeowners": ["@home-assistant/core"], "config_flow": false, - "dependencies": ["hardware", "hassio"], + "dependencies": ["hardware"], "documentation": "https://www.home-assistant.io/integrations/hardkernel", "integration_type": "hardware" } diff --git a/tests/components/hardkernel/test_hardware.py b/tests/components/hardkernel/test_hardware.py index 7e063a9f07a..ee2299f383c 100644 --- a/tests/components/hardkernel/test_hardware.py +++ b/tests/components/hardkernel/test_hardware.py @@ -4,7 +4,9 @@ from unittest.mock import patch import pytest from homeassistant.components.hardkernel.const import DOMAIN +from homeassistant.components.hassio import DOMAIN as HASSIO_DOMAIN from homeassistant.core import HomeAssistant +from homeassistant.setup import async_setup_component from tests.common import MockConfigEntry, MockModule, mock_integration from tests.typing import WebSocketGenerator @@ -15,6 +17,7 @@ async def test_hardware_info( ) -> None: """Test we can get the board info.""" mock_integration(hass, MockModule("hassio")) + await async_setup_component(hass, HASSIO_DOMAIN, {}) # Setup the config entry config_entry = MockConfigEntry( @@ -66,6 +69,7 @@ async def test_hardware_info_fail( ) -> None: """Test async_info raises if os_info is not as expected.""" mock_integration(hass, MockModule("hassio")) + await async_setup_component(hass, HASSIO_DOMAIN, {}) # Setup the config entry config_entry = MockConfigEntry( diff --git a/tests/components/hardkernel/test_init.py b/tests/components/hardkernel/test_init.py index 877a44a2ca2..98f4c08cc80 100644 --- a/tests/components/hardkernel/test_init.py +++ b/tests/components/hardkernel/test_init.py @@ -2,8 +2,10 @@ from unittest.mock import patch from homeassistant.components.hardkernel.const import DOMAIN +from homeassistant.components.hassio import DOMAIN as HASSIO_DOMAIN from homeassistant.config_entries import ConfigEntryState from homeassistant.core import HomeAssistant +from homeassistant.setup import async_setup_component from tests.common import MockConfigEntry, MockModule, mock_integration @@ -11,6 +13,7 @@ from tests.common import MockConfigEntry, MockModule, mock_integration async def test_setup_entry(hass: HomeAssistant) -> None: """Test setup of a config entry.""" mock_integration(hass, MockModule("hassio")) + await async_setup_component(hass, HASSIO_DOMAIN, {}) # Setup the config entry config_entry = MockConfigEntry( @@ -30,9 +33,30 @@ async def test_setup_entry(hass: HomeAssistant) -> None: assert len(mock_get_os_info.mock_calls) == 1 +async def test_setup_entry_no_hassio(hass: HomeAssistant) -> None: + """Test setup of a config entry without hassio.""" + # Setup the config entry + config_entry = MockConfigEntry( + data={}, + domain=DOMAIN, + options={}, + title="Hardkernel", + ) + config_entry.add_to_hass(hass) + assert len(hass.config_entries.async_entries()) == 1 + + with patch("homeassistant.components.hardkernel.get_os_info") as mock_get_os_info: + assert not await hass.config_entries.async_setup(config_entry.entry_id) + await hass.async_block_till_done() + + assert len(mock_get_os_info.mock_calls) == 0 + assert len(hass.config_entries.async_entries()) == 0 + + async def test_setup_entry_wrong_board(hass: HomeAssistant) -> None: """Test setup of a config entry with wrong board type.""" mock_integration(hass, MockModule("hassio")) + await async_setup_component(hass, HASSIO_DOMAIN, {}) # Setup the config entry config_entry = MockConfigEntry( @@ -58,6 +82,7 @@ async def test_setup_entry_wrong_board(hass: HomeAssistant) -> None: async def test_setup_entry_wait_hassio(hass: HomeAssistant) -> None: """Test setup of a config entry when hassio has not fetched os_info.""" mock_integration(hass, MockModule("hassio")) + await async_setup_component(hass, HASSIO_DOMAIN, {}) # Setup the config entry config_entry = MockConfigEntry(