diff --git a/tests/common.py b/tests/common.py index 5050d67b0cb..851f91cfc3e 100644 --- a/tests/common.py +++ b/tests/common.py @@ -3,7 +3,7 @@ from __future__ import annotations import asyncio -from collections.abc import Mapping, Sequence +from collections.abc import Callable, Coroutine, Mapping, Sequence from contextlib import asynccontextmanager, contextmanager from datetime import UTC, datetime, timedelta from enum import Enum @@ -858,13 +858,25 @@ class MockPlatform: def __init__( self, - setup_platform=None, - dependencies=None, - platform_schema=None, - async_setup_platform=None, - async_setup_entry=None, - scan_interval=None, - ): + *, + setup_platform: Callable[ + [HomeAssistant, ConfigType, AddEntitiesCallback, DiscoveryInfoType | None], + None, + ] + | None = None, + dependencies: list[str] | None = None, + platform_schema: vol.Schema | None = None, + async_setup_platform: Callable[ + [HomeAssistant, ConfigType, AddEntitiesCallback, DiscoveryInfoType | None], + Coroutine[Any, Any, None], + ] + | None = None, + async_setup_entry: Callable[ + [HomeAssistant, ConfigEntry, AddEntitiesCallback], Coroutine[Any, Any, None] + ] + | None = None, + scan_interval: timedelta | None = None, + ) -> None: """Initialize the platform.""" self.DEPENDENCIES = dependencies or [] diff --git a/tests/components/alarm_control_panel/conftest.py b/tests/components/alarm_control_panel/conftest.py index 34a4b483e3b..620b74dd80e 100644 --- a/tests/components/alarm_control_panel/conftest.py +++ b/tests/components/alarm_control_panel/conftest.py @@ -160,7 +160,6 @@ async def setup_lock_platform_test_entity( ) return True - MockPlatform(hass, f"{TEST_DOMAIN}.config_flow") mock_integration( hass, MockModule( diff --git a/tests/components/lock/conftest.py b/tests/components/lock/conftest.py index e8291badd0b..f1715687339 100644 --- a/tests/components/lock/conftest.py +++ b/tests/components/lock/conftest.py @@ -103,7 +103,6 @@ async def setup_lock_platform_test_entity( ) return True - MockPlatform(hass, f"{TEST_DOMAIN}.config_flow") mock_integration( hass, MockModule( diff --git a/tests/helpers/test_discovery.py b/tests/helpers/test_discovery.py index dc4b2951b2f..100b50e2749 100644 --- a/tests/helpers/test_discovery.py +++ b/tests/helpers/test_discovery.py @@ -132,7 +132,9 @@ async def test_circular_import(hass: HomeAssistant) -> None: # dependencies are only set in component level # since we are using manifest to hold them mock_integration(hass, MockModule("test_circular", dependencies=["test_component"])) - mock_platform(hass, "test_circular.switch", MockPlatform(setup_platform)) + mock_platform( + hass, "test_circular.switch", MockPlatform(setup_platform=setup_platform) + ) await setup.async_setup_component( hass, diff --git a/tests/helpers/test_entity_component.py b/tests/helpers/test_entity_component.py index 39cb48eed0e..32ce740edb2 100644 --- a/tests/helpers/test_entity_component.py +++ b/tests/helpers/test_entity_component.py @@ -52,7 +52,7 @@ async def test_setup_loads_platforms(hass: HomeAssistant) -> None: mock_integration(hass, MockModule("test_component", setup=component_setup)) # mock the dependencies mock_integration(hass, MockModule("mod2", dependencies=["test_component"])) - mock_platform(hass, "mod2.test_domain", MockPlatform(platform_setup)) + mock_platform(hass, "mod2.test_domain", MockPlatform(setup_platform=platform_setup)) component = EntityComponent(_LOGGER, DOMAIN, hass) @@ -71,8 +71,12 @@ async def test_setup_recovers_when_setup_raises(hass: HomeAssistant) -> None: platform1_setup = Mock(side_effect=Exception("Broken")) platform2_setup = Mock(return_value=None) - mock_platform(hass, "mod1.test_domain", MockPlatform(platform1_setup)) - mock_platform(hass, "mod2.test_domain", MockPlatform(platform2_setup)) + mock_platform( + hass, "mod1.test_domain", MockPlatform(setup_platform=platform1_setup) + ) + mock_platform( + hass, "mod2.test_domain", MockPlatform(setup_platform=platform2_setup) + ) component = EntityComponent(_LOGGER, DOMAIN, hass) @@ -128,7 +132,9 @@ async def test_set_scan_interval_via_config(hass: HomeAssistant) -> None: """Test the platform setup.""" add_entities([MockEntity(should_poll=True)]) - mock_platform(hass, "platform.test_domain", MockPlatform(platform_setup)) + mock_platform( + hass, "platform.test_domain", MockPlatform(setup_platform=platform_setup) + ) component = EntityComponent(_LOGGER, DOMAIN, hass) @@ -154,7 +160,7 @@ async def test_set_entity_namespace_via_config(hass: HomeAssistant) -> None: """Test the platform setup.""" add_entities([MockEntity(name="beer"), MockEntity(name=None)]) - platform = MockPlatform(platform_setup) + platform = MockPlatform(setup_platform=platform_setup) mock_platform(hass, "platform.test_domain", platform) @@ -204,7 +210,9 @@ async def test_platform_not_ready(hass: HomeAssistant) -> None: """Test that we retry when platform not ready.""" platform1_setup = Mock(side_effect=[PlatformNotReady, PlatformNotReady, None]) mock_integration(hass, MockModule("mod1")) - mock_platform(hass, "mod1.test_domain", MockPlatform(platform1_setup)) + mock_platform( + hass, "mod1.test_domain", MockPlatform(setup_platform=platform1_setup) + ) component = EntityComponent(_LOGGER, DOMAIN, hass) @@ -678,7 +686,9 @@ async def test_platforms_shutdown_on_stop(hass: HomeAssistant) -> None: """Test that we shutdown platforms on stop.""" platform1_setup = Mock(side_effect=[PlatformNotReady, PlatformNotReady, None]) mock_integration(hass, MockModule("mod1")) - mock_platform(hass, "mod1.test_domain", MockPlatform(platform1_setup)) + mock_platform( + hass, "mod1.test_domain", MockPlatform(setup_platform=platform1_setup) + ) component = EntityComponent(_LOGGER, DOMAIN, hass) diff --git a/tests/helpers/test_entity_platform.py b/tests/helpers/test_entity_platform.py index 56ddcd9a6c9..68024bc936f 100644 --- a/tests/helpers/test_entity_platform.py +++ b/tests/helpers/test_entity_platform.py @@ -228,7 +228,7 @@ async def test_set_scan_interval_via_platform(hass: HomeAssistant) -> None: """Test the platform setup.""" add_entities([MockEntity(should_poll=True)]) - platform = MockPlatform(platform_setup) + platform = MockPlatform(setup_platform=platform_setup) platform.SCAN_INTERVAL = timedelta(seconds=30) mock_platform(hass, "platform.test_domain", platform) diff --git a/tests/test_setup.py b/tests/test_setup.py index 92367b84ab7..4ff0f465e21 100644 --- a/tests/test_setup.py +++ b/tests/test_setup.py @@ -163,7 +163,7 @@ async def test_validate_platform_config_2( mock_platform( hass, "whatever.platform_conf", - MockPlatform("whatever", platform_schema=platform_schema), + MockPlatform(platform_schema=platform_schema), ) with assert_setup_component(1): @@ -192,7 +192,7 @@ async def test_validate_platform_config_3( mock_platform( hass, "whatever.platform_conf", - MockPlatform("whatever", platform_schema=platform_schema), + MockPlatform(platform_schema=platform_schema), ) with assert_setup_component(1):