diff --git a/tests/components/lastfm/conftest.py b/tests/components/lastfm/conftest.py index e17a1ccfa8a..361bb401521 100644 --- a/tests/components/lastfm/conftest.py +++ b/tests/components/lastfm/conftest.py @@ -11,14 +11,9 @@ from homeassistant.const import CONF_API_KEY from homeassistant.core import HomeAssistant from homeassistant.setup import async_setup_component +from . import API_KEY, USERNAME_1, USERNAME_2, MockNetwork, MockUser + from tests.common import MockConfigEntry -from tests.components.lastfm import ( - API_KEY, - USERNAME_1, - USERNAME_2, - MockNetwork, - MockUser, -) type ComponentSetup = Callable[[MockConfigEntry, MockUser], Awaitable[None]] diff --git a/tests/components/light/test_device_condition.py b/tests/components/light/test_device_condition.py index 01b735bd5af..cef3ef788cb 100644 --- a/tests/components/light/test_device_condition.py +++ b/tests/components/light/test_device_condition.py @@ -16,6 +16,8 @@ from homeassistant.helpers.entity_registry import RegistryEntryHider from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util +from .common import MockLight + from tests.common import ( MockConfigEntry, async_get_device_automation_capabilities, @@ -23,7 +25,6 @@ from tests.common import ( async_mock_service, setup_test_component_platform, ) -from tests.components.light.common import MockLight @pytest.fixture(autouse=True, name="stub_blueprint_populate") diff --git a/tests/components/light/test_init.py b/tests/components/light/test_init.py index 6832b5812e2..a01d70d328c 100644 --- a/tests/components/light/test_init.py +++ b/tests/components/light/test_init.py @@ -22,13 +22,14 @@ from homeassistant.exceptions import HomeAssistantError, Unauthorized from homeassistant.setup import async_setup_component import homeassistant.util.color as color_util +from .common import MockLight + from tests.common import ( MockEntityPlatform, MockUser, async_mock_service, setup_test_component_platform, ) -from tests.components.light.common import MockLight orig_Profiles = light.Profiles diff --git a/tests/components/linear_garage_door/test_init.py b/tests/components/linear_garage_door/test_init.py index 92ff832be87..640264eb207 100644 --- a/tests/components/linear_garage_door/test_init.py +++ b/tests/components/linear_garage_door/test_init.py @@ -8,8 +8,9 @@ import pytest from homeassistant.config_entries import ConfigEntryState from homeassistant.core import HomeAssistant +from . import setup_integration + from tests.common import MockConfigEntry -from tests.components.linear_garage_door import setup_integration async def test_unload_entry( diff --git a/tests/components/matrix/test_commands.py b/tests/components/matrix/test_commands.py index 17d92760fa0..8539252ad66 100644 --- a/tests/components/matrix/test_commands.py +++ b/tests/components/matrix/test_commands.py @@ -11,7 +11,7 @@ import pytest from homeassistant.components.matrix import MatrixBot, RoomID from homeassistant.core import Event, HomeAssistant -from tests.components.matrix.conftest import ( +from .conftest import ( MOCK_EXPRESSION_COMMANDS, MOCK_WORD_COMMANDS, TEST_MXID, diff --git a/tests/components/matrix/test_login.py b/tests/components/matrix/test_login.py index caf74576d4e..ad9bf660402 100644 --- a/tests/components/matrix/test_login.py +++ b/tests/components/matrix/test_login.py @@ -6,12 +6,7 @@ import pytest from homeassistant.components.matrix import MatrixBot from homeassistant.exceptions import ConfigEntryAuthFailed, HomeAssistantError -from tests.components.matrix.conftest import ( - TEST_DEVICE_ID, - TEST_MXID, - TEST_PASSWORD, - TEST_TOKEN, -) +from .conftest import TEST_DEVICE_ID, TEST_MXID, TEST_PASSWORD, TEST_TOKEN @dataclass diff --git a/tests/components/matrix/test_rooms.py b/tests/components/matrix/test_rooms.py index 66d1afbf532..e8e94224066 100644 --- a/tests/components/matrix/test_rooms.py +++ b/tests/components/matrix/test_rooms.py @@ -9,9 +9,7 @@ from homeassistant.const import EVENT_HOMEASSISTANT_START from homeassistant.core import HomeAssistant from homeassistant.setup import async_setup_component -from .conftest import MOCK_CONFIG_DATA - -from tests.components.matrix.conftest import TEST_BAD_ROOM, TEST_JOINABLE_ROOMS +from .conftest import MOCK_CONFIG_DATA, TEST_BAD_ROOM, TEST_JOINABLE_ROOMS async def test_join( diff --git a/tests/components/matrix/test_send_message.py b/tests/components/matrix/test_send_message.py index 58c0573a22e..cdea2270cf9 100644 --- a/tests/components/matrix/test_send_message.py +++ b/tests/components/matrix/test_send_message.py @@ -12,7 +12,7 @@ from homeassistant.components.matrix.const import FORMAT_HTML, SERVICE_SEND_MESS from homeassistant.components.notify import ATTR_DATA, ATTR_MESSAGE, ATTR_TARGET from homeassistant.core import HomeAssistant -from tests.components.matrix.conftest import TEST_BAD_ROOM, TEST_JOINABLE_ROOMS +from .conftest import TEST_BAD_ROOM, TEST_JOINABLE_ROOMS async def test_send_message( diff --git a/tests/components/media_extractor/__init__.py b/tests/components/media_extractor/__init__.py index 79130f1ea4b..631bdc19ed7 100644 --- a/tests/components/media_extractor/__init__.py +++ b/tests/components/media_extractor/__init__.py @@ -2,8 +2,7 @@ from typing import Any -from tests.common import load_json_object_fixture -from tests.components.media_extractor.const import ( +from .const import ( AUDIO_QUERY, NO_FORMATS_RESPONSE, SOUNDCLOUD_TRACK, @@ -12,6 +11,8 @@ from tests.components.media_extractor.const import ( YOUTUBE_VIDEO, ) +from tests.common import load_json_object_fixture + def _get_base_fixture(url: str) -> str: return { diff --git a/tests/components/media_extractor/conftest.py b/tests/components/media_extractor/conftest.py index 91cff851ab0..1d198681f3f 100644 --- a/tests/components/media_extractor/conftest.py +++ b/tests/components/media_extractor/conftest.py @@ -10,9 +10,10 @@ from homeassistant.components.media_extractor import DOMAIN from homeassistant.core import HomeAssistant, ServiceCall from homeassistant.setup import async_setup_component +from . import MockYoutubeDL +from .const import AUDIO_QUERY + from tests.common import async_mock_service -from tests.components.media_extractor import MockYoutubeDL -from tests.components.media_extractor.const import AUDIO_QUERY @pytest.fixture(autouse=True) diff --git a/tests/components/media_extractor/test_init.py b/tests/components/media_extractor/test_init.py index ee74eb4660b..8c8a1407ccc 100644 --- a/tests/components/media_extractor/test_init.py +++ b/tests/components/media_extractor/test_init.py @@ -19,14 +19,10 @@ from homeassistant.core import HomeAssistant, ServiceCall from homeassistant.exceptions import HomeAssistantError from homeassistant.setup import async_setup_component +from . import YOUTUBE_EMPTY_PLAYLIST, YOUTUBE_PLAYLIST, YOUTUBE_VIDEO, MockYoutubeDL +from .const import NO_FORMATS_RESPONSE, SOUNDCLOUD_TRACK + from tests.common import load_json_object_fixture -from tests.components.media_extractor import ( - YOUTUBE_EMPTY_PLAYLIST, - YOUTUBE_PLAYLIST, - YOUTUBE_VIDEO, - MockYoutubeDL, -) -from tests.components.media_extractor.const import NO_FORMATS_RESPONSE, SOUNDCLOUD_TRACK async def test_play_media_service_is_registered(hass: HomeAssistant) -> None: diff --git a/tests/components/melissa/test_climate.py b/tests/components/melissa/test_climate.py index ff59f925961..ceb14faf8fb 100644 --- a/tests/components/melissa/test_climate.py +++ b/tests/components/melissa/test_climate.py @@ -12,7 +12,7 @@ from homeassistant.const import ATTR_ENTITY_ID, ATTR_TEMPERATURE from homeassistant.core import HomeAssistant import homeassistant.helpers.entity_registry as er -from tests.components.melissa import setup_integration +from . import setup_integration async def test_setup_platform( diff --git a/tests/components/melissa/test_init.py b/tests/components/melissa/test_init.py index d809f42e409..2eebc012fe1 100644 --- a/tests/components/melissa/test_init.py +++ b/tests/components/melissa/test_init.py @@ -2,7 +2,7 @@ from homeassistant.core import HomeAssistant -from tests.components.melissa import setup_integration +from . import setup_integration async def test_setup(hass: HomeAssistant, mock_melissa) -> None: diff --git a/tests/components/netatmo/test_binary_sensor.py b/tests/components/netatmo/test_binary_sensor.py index 53aea461fde..7b841ba204e 100644 --- a/tests/components/netatmo/test_binary_sensor.py +++ b/tests/components/netatmo/test_binary_sensor.py @@ -9,8 +9,9 @@ from homeassistant.const import Platform from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er +from .common import snapshot_platform_entities + from tests.common import MockConfigEntry -from tests.components.netatmo.common import snapshot_platform_entities @pytest.mark.usefixtures("entity_registry_enabled_by_default") diff --git a/tests/components/number/conftest.py b/tests/components/number/conftest.py index a84ab03611b..49b492821ab 100644 --- a/tests/components/number/conftest.py +++ b/tests/components/number/conftest.py @@ -2,7 +2,7 @@ import pytest -from tests.components.number.common import MockNumberEntity +from .common import MockNumberEntity UNIQUE_NUMBER = "unique_number" diff --git a/tests/components/number/test_init.py b/tests/components/number/test_init.py index 9fe9322c731..dbdbab31d63 100644 --- a/tests/components/number/test_init.py +++ b/tests/components/number/test_init.py @@ -43,6 +43,8 @@ from homeassistant.helpers.restore_state import STORAGE_KEY as RESTORE_STATE_KEY from homeassistant.setup import async_setup_component from homeassistant.util.unit_system import METRIC_SYSTEM, US_CUSTOMARY_SYSTEM +from . import common + from tests.common import ( MockConfigEntry, MockModule, @@ -54,7 +56,6 @@ from tests.common import ( mock_restore_cache_with_extra_data, setup_test_component_platform, ) -from tests.components.number import common TEST_DOMAIN = "test" diff --git a/tests/components/opensky/test_config_flow.py b/tests/components/opensky/test_config_flow.py index e30d5ad8475..b99c264f205 100644 --- a/tests/components/opensky/test_config_flow.py +++ b/tests/components/opensky/test_config_flow.py @@ -22,8 +22,9 @@ from homeassistant.const import ( from homeassistant.core import HomeAssistant from homeassistant.data_entry_flow import FlowResultType +from . import setup_integration + from tests.common import MockConfigEntry -from tests.components.opensky import setup_integration async def test_full_user_flow(hass: HomeAssistant, mock_setup_entry) -> None: diff --git a/tests/components/opensky/test_init.py b/tests/components/opensky/test_init.py index f5acf7479a2..cc53bc1de14 100644 --- a/tests/components/opensky/test_init.py +++ b/tests/components/opensky/test_init.py @@ -10,8 +10,9 @@ from python_opensky.exceptions import OpenSkyUnauthenticatedError from homeassistant.config_entries import ConfigEntryState from homeassistant.core import HomeAssistant +from . import setup_integration + from tests.common import MockConfigEntry -from tests.components.opensky import setup_integration async def test_load_unload_entry( diff --git a/tests/components/opensky/test_sensor.py b/tests/components/opensky/test_sensor.py index 0c84762dd50..937540a42c1 100644 --- a/tests/components/opensky/test_sensor.py +++ b/tests/components/opensky/test_sensor.py @@ -14,12 +14,13 @@ from homeassistant.components.opensky.const import ( ) from homeassistant.core import Event, HomeAssistant +from . import setup_integration + from tests.common import ( MockConfigEntry, async_fire_time_changed, load_json_object_fixture, ) -from tests.components.opensky import setup_integration async def test_sensor( diff --git a/tests/components/overkiz/conftest.py b/tests/components/overkiz/conftest.py index ea021ccef1e..8ab26e3587b 100644 --- a/tests/components/overkiz/conftest.py +++ b/tests/components/overkiz/conftest.py @@ -8,14 +8,10 @@ from typing_extensions import Generator from homeassistant.components.overkiz.const import DOMAIN from homeassistant.core import HomeAssistant +from . import load_setup_fixture +from .test_config_flow import TEST_EMAIL, TEST_GATEWAY_ID, TEST_PASSWORD, TEST_SERVER + from tests.common import MockConfigEntry -from tests.components.overkiz import load_setup_fixture -from tests.components.overkiz.test_config_flow import ( - TEST_EMAIL, - TEST_GATEWAY_ID, - TEST_PASSWORD, - TEST_SERVER, -) MOCK_SETUP_RESPONSE = Mock(devices=[], gateways=[]) diff --git a/tests/components/recorder/test_purge_v32_schema.py b/tests/components/recorder/test_purge_v32_schema.py index e5bd0eae060..fb636cfa9dc 100644 --- a/tests/components/recorder/test_purge_v32_schema.py +++ b/tests/components/recorder/test_purge_v32_schema.py @@ -34,8 +34,7 @@ from .common import ( async_wait_recording_done, old_db_schema, ) - -from tests.components.recorder.db_schema_32 import ( +from .db_schema_32 import ( EventData, Events, RecorderRuns, @@ -44,6 +43,7 @@ from tests.components.recorder.db_schema_32 import ( StatisticsRuns, StatisticsShortTerm, ) + from tests.typing import RecorderInstanceGenerator diff --git a/tests/components/roborock/test_image.py b/tests/components/roborock/test_image.py index bc45c6dec05..c884baef123 100644 --- a/tests/components/roborock/test_image.py +++ b/tests/components/roborock/test_image.py @@ -13,8 +13,9 @@ from homeassistant.core import HomeAssistant from homeassistant.setup import async_setup_component from homeassistant.util import dt as dt_util +from .mock_data import MAP_DATA, PROP + from tests.common import MockConfigEntry, async_fire_time_changed -from tests.components.roborock.mock_data import MAP_DATA, PROP from tests.typing import ClientSessionGenerator diff --git a/tests/components/roborock/test_vacuum.py b/tests/components/roborock/test_vacuum.py index ea1075726ba..15a64cbecf3 100644 --- a/tests/components/roborock/test_vacuum.py +++ b/tests/components/roborock/test_vacuum.py @@ -27,8 +27,9 @@ from homeassistant.exceptions import HomeAssistantError from homeassistant.helpers import entity_registry as er from homeassistant.setup import async_setup_component +from .mock_data import PROP + from tests.common import MockConfigEntry -from tests.components.roborock.mock_data import PROP ENTITY_ID = "vacuum.roborock_s7_maxv" DEVICE_ID = "abc123" diff --git a/tests/components/rova/test_init.py b/tests/components/rova/test_init.py index e522d5bfb12..2190e2f8ce3 100644 --- a/tests/components/rova/test_init.py +++ b/tests/components/rova/test_init.py @@ -12,8 +12,9 @@ from homeassistant.const import Platform from homeassistant.core import HomeAssistant from homeassistant.helpers import device_registry as dr, issue_registry as ir +from . import setup_with_selected_platforms + from tests.common import MockConfigEntry -from tests.components.rova import setup_with_selected_platforms async def test_reload(