From 00dd27ef1b5ee2279694cf6a61fb2163def041db Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Mon, 19 Sep 2022 09:46:59 +0200 Subject: [PATCH] Apply hass-relative-import to tests (i-r) (#78732) --- tests/components/iaqualink/test_init.py | 3 ++- tests/components/iaqualink/test_utils.py | 2 +- tests/components/image_processing/test_init.py | 3 ++- tests/components/intellifire/test_config_flow.py | 3 ++- tests/components/ipp/test_init.py | 3 ++- tests/components/ipp/test_sensor.py | 3 ++- tests/components/knx/test_diagnostic.py | 3 ++- tests/components/minio/test_minio.py | 2 +- tests/components/modern_forms/test_binary_sensor.py | 3 ++- tests/components/modern_forms/test_fan.py | 3 ++- tests/components/modern_forms/test_init.py | 6 ++---- tests/components/modern_forms/test_light.py | 3 ++- tests/components/modern_forms/test_sensor.py | 3 ++- tests/components/modern_forms/test_switch.py | 3 ++- tests/components/nam/test_button.py | 2 +- tests/components/nam/test_diagnostics.py | 3 ++- tests/components/nam/test_init.py | 3 ++- tests/components/nam/test_sensor.py | 3 +-- tests/components/nextdns/test_diagnostics.py | 3 ++- tests/components/nightscout/test_config_flow.py | 7 ++----- tests/components/nightscout/test_init.py | 3 ++- tests/components/nightscout/test_sensor.py | 2 +- tests/components/nws/conftest.py | 2 +- tests/components/nws/test_init.py | 3 ++- tests/components/nws/test_sensor.py | 5 +++-- tests/components/nws/test_weather.py | 5 +++-- tests/components/renault/test_services.py | 3 ++- tests/components/rflink/test_binary_sensor.py | 3 ++- tests/components/rflink/test_cover.py | 3 ++- tests/components/rflink/test_light.py | 3 ++- tests/components/rflink/test_sensor.py | 2 +- tests/components/rflink/test_switch.py | 3 ++- tests/components/rfxtrx/test_binary_sensor.py | 3 ++- tests/components/rfxtrx/test_cover.py | 3 ++- tests/components/rfxtrx/test_device_action.py | 3 ++- tests/components/rfxtrx/test_device_trigger.py | 3 ++- tests/components/rfxtrx/test_init.py | 3 ++- tests/components/rfxtrx/test_light.py | 3 ++- tests/components/rfxtrx/test_sensor.py | 3 ++- tests/components/rfxtrx/test_switch.py | 3 ++- tests/components/roku/test_binary_sensor.py | 3 ++- tests/components/roku/test_config_flow.py | 5 +++-- tests/components/roku/test_remote.py | 3 ++- tests/components/roku/test_sensor.py | 3 ++- tests/components/ruckus_unleashed/test_config_flow.py | 3 ++- tests/components/ruckus_unleashed/test_device_tracker.py | 5 +++-- tests/components/ruckus_unleashed/test_init.py | 2 +- 47 files changed, 90 insertions(+), 59 deletions(-) diff --git a/tests/components/iaqualink/test_init.py b/tests/components/iaqualink/test_init.py index 3a35804f447..bd2e072d213 100644 --- a/tests/components/iaqualink/test_init.py +++ b/tests/components/iaqualink/test_init.py @@ -24,8 +24,9 @@ from homeassistant.config_entries import ConfigEntryState from homeassistant.const import ATTR_ASSUMED_STATE, STATE_ON, STATE_UNAVAILABLE from homeassistant.util import dt as dt_util +from .conftest import get_aqualink_device, get_aqualink_system + from tests.common import async_fire_time_changed -from tests.components.iaqualink.conftest import get_aqualink_device, get_aqualink_system async def _ffwd_next_update_interval(hass): diff --git a/tests/components/iaqualink/test_utils.py b/tests/components/iaqualink/test_utils.py index 56b239c0d9f..b4462d26dbc 100644 --- a/tests/components/iaqualink/test_utils.py +++ b/tests/components/iaqualink/test_utils.py @@ -6,7 +6,7 @@ import pytest from homeassistant.components.iaqualink.utils import await_or_reraise from homeassistant.exceptions import HomeAssistantError -from tests.components.iaqualink.conftest import async_raises, async_returns +from .conftest import async_raises, async_returns async def test_await_or_reraise(hass): diff --git a/tests/components/image_processing/test_init.py b/tests/components/image_processing/test_init.py index ed8d49e8ddb..9953df041ae 100644 --- a/tests/components/image_processing/test_init.py +++ b/tests/components/image_processing/test_init.py @@ -9,8 +9,9 @@ from homeassistant.const import ATTR_ENTITY_PICTURE from homeassistant.exceptions import HomeAssistantError from homeassistant.setup import async_setup_component +from . import common + from tests.common import assert_setup_component, async_capture_events -from tests.components.image_processing import common @pytest.fixture diff --git a/tests/components/intellifire/test_config_flow.py b/tests/components/intellifire/test_config_flow.py index 95e5d735c35..9e5d5627a94 100644 --- a/tests/components/intellifire/test_config_flow.py +++ b/tests/components/intellifire/test_config_flow.py @@ -11,8 +11,9 @@ from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_PASSWORD, CONF_USE from homeassistant.core import HomeAssistant from homeassistant.data_entry_flow import FlowResultType +from .conftest import mock_api_connection_error + from tests.common import MockConfigEntry -from tests.components.intellifire.conftest import mock_api_connection_error @patch.multiple( diff --git a/tests/components/ipp/test_init.py b/tests/components/ipp/test_init.py index 5caffc62d7b..32060b4df86 100644 --- a/tests/components/ipp/test_init.py +++ b/tests/components/ipp/test_init.py @@ -3,7 +3,8 @@ from homeassistant.components.ipp.const import DOMAIN from homeassistant.config_entries import ConfigEntryState from homeassistant.core import HomeAssistant -from tests.components.ipp import init_integration +from . import init_integration + from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/ipp/test_sensor.py b/tests/components/ipp/test_sensor.py index 5531259c597..d772c6e9163 100644 --- a/tests/components/ipp/test_sensor.py +++ b/tests/components/ipp/test_sensor.py @@ -9,7 +9,8 @@ from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er from homeassistant.util import dt as dt_util -from tests.components.ipp import init_integration, mock_connection +from . import init_integration, mock_connection + from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/knx/test_diagnostic.py b/tests/components/knx/test_diagnostic.py index e2d93f17498..5f4dd01bcb6 100644 --- a/tests/components/knx/test_diagnostic.py +++ b/tests/components/knx/test_diagnostic.py @@ -22,9 +22,10 @@ from homeassistant.components.knx.const import ( ) from homeassistant.core import HomeAssistant +from .conftest import KNXTestKit + from tests.common import MockConfigEntry from tests.components.diagnostics import get_diagnostics_for_config_entry -from tests.components.knx.conftest import KNXTestKit async def test_diagnostics( diff --git a/tests/components/minio/test_minio.py b/tests/components/minio/test_minio.py index d6668470b55..cebca17b24d 100644 --- a/tests/components/minio/test_minio.py +++ b/tests/components/minio/test_minio.py @@ -19,7 +19,7 @@ from homeassistant.components.minio import ( from homeassistant.core import callback from homeassistant.setup import async_setup_component -from tests.components.minio.common import TEST_EVENT +from .common import TEST_EVENT @pytest.fixture(name="minio_client") diff --git a/tests/components/modern_forms/test_binary_sensor.py b/tests/components/modern_forms/test_binary_sensor.py index bc32e309958..6b64beb4f1a 100644 --- a/tests/components/modern_forms/test_binary_sensor.py +++ b/tests/components/modern_forms/test_binary_sensor.py @@ -5,7 +5,8 @@ from homeassistant.const import ATTR_ICON from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er -from tests.components.modern_forms import init_integration +from . import init_integration + from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/modern_forms/test_fan.py b/tests/components/modern_forms/test_fan.py index c9b6c66bb62..b445946706f 100644 --- a/tests/components/modern_forms/test_fan.py +++ b/tests/components/modern_forms/test_fan.py @@ -28,7 +28,8 @@ from homeassistant.const import ( from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er -from tests.components.modern_forms import init_integration +from . import init_integration + from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/modern_forms/test_init.py b/tests/components/modern_forms/test_init.py index 518355ac18b..fd6ff495470 100644 --- a/tests/components/modern_forms/test_init.py +++ b/tests/components/modern_forms/test_init.py @@ -8,10 +8,8 @@ from homeassistant.config_entries import ConfigEntryState from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er -from tests.components.modern_forms import ( - init_integration, - modern_forms_no_light_call_mock, -) +from . import init_integration, modern_forms_no_light_call_mock + from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/modern_forms/test_light.py b/tests/components/modern_forms/test_light.py index 29725ab4bcd..2d1fc1ca56d 100644 --- a/tests/components/modern_forms/test_light.py +++ b/tests/components/modern_forms/test_light.py @@ -21,7 +21,8 @@ from homeassistant.const import ( from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er -from tests.components.modern_forms import init_integration +from . import init_integration + from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/modern_forms/test_sensor.py b/tests/components/modern_forms/test_sensor.py index 638b3ddbacf..7e3914cd7d9 100644 --- a/tests/components/modern_forms/test_sensor.py +++ b/tests/components/modern_forms/test_sensor.py @@ -6,7 +6,8 @@ from homeassistant.const import ATTR_DEVICE_CLASS, ATTR_ICON from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er -from tests.components.modern_forms import init_integration, modern_forms_timers_set_mock +from . import init_integration, modern_forms_timers_set_mock + from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/modern_forms/test_switch.py b/tests/components/modern_forms/test_switch.py index 963264e3ca1..56f7edebcdd 100644 --- a/tests/components/modern_forms/test_switch.py +++ b/tests/components/modern_forms/test_switch.py @@ -15,7 +15,8 @@ from homeassistant.const import ( from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er -from tests.components.modern_forms import init_integration +from . import init_integration + from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/nam/test_button.py b/tests/components/nam/test_button.py index c8ed00b3376..5037d9c8720 100644 --- a/tests/components/nam/test_button.py +++ b/tests/components/nam/test_button.py @@ -6,7 +6,7 @@ from homeassistant.const import ATTR_DEVICE_CLASS, ATTR_ENTITY_ID, STATE_UNKNOWN from homeassistant.helpers import entity_registry as er from homeassistant.util import dt as dt_util -from tests.components.nam import init_integration +from . import init_integration async def test_button(hass): diff --git a/tests/components/nam/test_diagnostics.py b/tests/components/nam/test_diagnostics.py index ce7b6d59e78..321b1785038 100644 --- a/tests/components/nam/test_diagnostics.py +++ b/tests/components/nam/test_diagnostics.py @@ -1,9 +1,10 @@ """Test NAM diagnostics.""" import json +from . import init_integration + from tests.common import load_fixture from tests.components.diagnostics import get_diagnostics_for_config_entry -from tests.components.nam import init_integration async def test_entry_diagnostics(hass, hass_client): diff --git a/tests/components/nam/test_init.py b/tests/components/nam/test_init.py index 9eac901d693..b6f278d4e94 100644 --- a/tests/components/nam/test_init.py +++ b/tests/components/nam/test_init.py @@ -9,8 +9,9 @@ from homeassistant.config_entries import ConfigEntryState from homeassistant.const import STATE_UNAVAILABLE from homeassistant.helpers import entity_registry as er +from . import init_integration + from tests.common import MockConfigEntry -from tests.components.nam import init_integration async def test_async_setup_entry(hass): diff --git a/tests/components/nam/test_sensor.py b/tests/components/nam/test_sensor.py index 28eaea54186..bee4c515cd0 100644 --- a/tests/components/nam/test_sensor.py +++ b/tests/components/nam/test_sensor.py @@ -28,10 +28,9 @@ from homeassistant.helpers import entity_registry as er from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow -from . import INCOMPLETE_NAM_DATA, nam_data +from . import INCOMPLETE_NAM_DATA, init_integration, nam_data from tests.common import async_fire_time_changed -from tests.components.nam import init_integration async def test_sensor(hass): diff --git a/tests/components/nextdns/test_diagnostics.py b/tests/components/nextdns/test_diagnostics.py index 21c030274cc..6e79ac5c92a 100644 --- a/tests/components/nextdns/test_diagnostics.py +++ b/tests/components/nextdns/test_diagnostics.py @@ -7,9 +7,10 @@ from aiohttp import ClientSession from homeassistant.components.diagnostics import REDACTED from homeassistant.core import HomeAssistant +from . import init_integration + from tests.common import load_fixture from tests.components.diagnostics import get_diagnostics_for_config_entry -from tests.components.nextdns import init_integration async def test_entry_diagnostics( diff --git a/tests/components/nightscout/test_config_flow.py b/tests/components/nightscout/test_config_flow.py index 9a2b070c20c..7439f0b6b1c 100644 --- a/tests/components/nightscout/test_config_flow.py +++ b/tests/components/nightscout/test_config_flow.py @@ -9,12 +9,9 @@ from homeassistant.components.nightscout.const import DOMAIN from homeassistant.components.nightscout.utils import hash_from_url from homeassistant.const import CONF_URL +from . import GLUCOSE_READINGS, SERVER_STATUS, SERVER_STATUS_STATUS_ONLY + from tests.common import MockConfigEntry -from tests.components.nightscout import ( - GLUCOSE_READINGS, - SERVER_STATUS, - SERVER_STATUS_STATUS_ONLY, -) CONFIG = {CONF_URL: "https://some.url:1234"} diff --git a/tests/components/nightscout/test_init.py b/tests/components/nightscout/test_init.py index 04824139e20..782f90ea8d9 100644 --- a/tests/components/nightscout/test_init.py +++ b/tests/components/nightscout/test_init.py @@ -7,8 +7,9 @@ from homeassistant.components.nightscout.const import DOMAIN from homeassistant.config_entries import ConfigEntryState from homeassistant.const import CONF_URL +from . import init_integration + from tests.common import MockConfigEntry -from tests.components.nightscout import init_integration async def test_unload_entry(hass): diff --git a/tests/components/nightscout/test_sensor.py b/tests/components/nightscout/test_sensor.py index 5e73c75d93c..cd0c39ac61e 100644 --- a/tests/components/nightscout/test_sensor.py +++ b/tests/components/nightscout/test_sensor.py @@ -7,7 +7,7 @@ from homeassistant.components.nightscout.const import ( ) from homeassistant.const import ATTR_DATE, ATTR_ICON, STATE_UNAVAILABLE -from tests.components.nightscout import ( +from . import ( GLUCOSE_READINGS, init_integration, init_integration_empty_response, diff --git a/tests/components/nws/conftest.py b/tests/components/nws/conftest.py index 98ac9191e0d..3ec9b3d6867 100644 --- a/tests/components/nws/conftest.py +++ b/tests/components/nws/conftest.py @@ -3,7 +3,7 @@ from unittest.mock import AsyncMock, patch import pytest -from tests.components.nws.const import DEFAULT_FORECAST, DEFAULT_OBSERVATION +from .const import DEFAULT_FORECAST, DEFAULT_OBSERVATION @pytest.fixture() diff --git a/tests/components/nws/test_init.py b/tests/components/nws/test_init.py index 01a203aa07b..f6b5fef9c4a 100644 --- a/tests/components/nws/test_init.py +++ b/tests/components/nws/test_init.py @@ -3,8 +3,9 @@ from homeassistant.components.nws.const import DOMAIN from homeassistant.components.weather import DOMAIN as WEATHER_DOMAIN from homeassistant.const import STATE_UNAVAILABLE +from .const import NWS_CONFIG + from tests.common import MockConfigEntry -from tests.components.nws.const import NWS_CONFIG async def test_unload_entry(hass, mock_simple_nws): diff --git a/tests/components/nws/test_sensor.py b/tests/components/nws/test_sensor.py index 5a55907e53b..78d39575522 100644 --- a/tests/components/nws/test_sensor.py +++ b/tests/components/nws/test_sensor.py @@ -8,8 +8,7 @@ from homeassistant.helpers import entity_registry as er from homeassistant.util import slugify from homeassistant.util.unit_system import IMPERIAL_SYSTEM, METRIC_SYSTEM -from tests.common import MockConfigEntry -from tests.components.nws.const import ( +from .const import ( EXPECTED_FORECAST_IMPERIAL, EXPECTED_FORECAST_METRIC, NONE_OBSERVATION, @@ -18,6 +17,8 @@ from tests.components.nws.const import ( SENSOR_EXPECTED_OBSERVATION_METRIC, ) +from tests.common import MockConfigEntry + @pytest.mark.parametrize( "units,result_observation,result_forecast", diff --git a/tests/components/nws/test_weather.py b/tests/components/nws/test_weather.py index 78ab7eb4ac5..3f3e9a649f3 100644 --- a/tests/components/nws/test_weather.py +++ b/tests/components/nws/test_weather.py @@ -17,8 +17,7 @@ from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util from homeassistant.util.unit_system import IMPERIAL_SYSTEM, METRIC_SYSTEM -from tests.common import MockConfigEntry, async_fire_time_changed -from tests.components.nws.const import ( +from .const import ( EXPECTED_FORECAST_IMPERIAL, EXPECTED_FORECAST_METRIC, NONE_FORECAST, @@ -28,6 +27,8 @@ from tests.components.nws.const import ( WEATHER_EXPECTED_OBSERVATION_METRIC, ) +from tests.common import MockConfigEntry, async_fire_time_changed + @pytest.mark.parametrize( "units,result_observation,result_forecast", diff --git a/tests/components/renault/test_services.py b/tests/components/renault/test_services.py index b7748cafb5d..b45273c581b 100644 --- a/tests/components/renault/test_services.py +++ b/tests/components/renault/test_services.py @@ -29,8 +29,9 @@ from homeassistant.const import ( from homeassistant.core import HomeAssistant from homeassistant.helpers import device_registry as dr +from .const import MOCK_VEHICLES + from tests.common import load_fixture -from tests.components.renault.const import MOCK_VEHICLES pytestmark = pytest.mark.usefixtures("patch_renault_account", "patch_get_vehicles") diff --git a/tests/components/rflink/test_binary_sensor.py b/tests/components/rflink/test_binary_sensor.py index c8d701f300f..d806e51a833 100644 --- a/tests/components/rflink/test_binary_sensor.py +++ b/tests/components/rflink/test_binary_sensor.py @@ -19,8 +19,9 @@ from homeassistant.const import ( from homeassistant.core import CoreState, State, callback import homeassistant.util.dt as dt_util +from .test_init import mock_rflink + from tests.common import async_fire_time_changed, mock_restore_cache -from tests.components.rflink.test_init import mock_rflink DOMAIN = "binary_sensor" diff --git a/tests/components/rflink/test_cover.py b/tests/components/rflink/test_cover.py index 1dac064d778..56ceab05091 100644 --- a/tests/components/rflink/test_cover.py +++ b/tests/components/rflink/test_cover.py @@ -14,8 +14,9 @@ from homeassistant.const import ( ) from homeassistant.core import CoreState, State, callback +from .test_init import mock_rflink + from tests.common import mock_restore_cache -from tests.components.rflink.test_init import mock_rflink DOMAIN = "cover" diff --git a/tests/components/rflink/test_light.py b/tests/components/rflink/test_light.py index 5f9672ac9fc..662f6affd18 100644 --- a/tests/components/rflink/test_light.py +++ b/tests/components/rflink/test_light.py @@ -15,8 +15,9 @@ from homeassistant.const import ( ) from homeassistant.core import CoreState, State, callback +from .test_init import mock_rflink + from tests.common import mock_restore_cache -from tests.components.rflink.test_init import mock_rflink DOMAIN = "light" diff --git a/tests/components/rflink/test_sensor.py b/tests/components/rflink/test_sensor.py index d18076a372a..13d7e4b300d 100644 --- a/tests/components/rflink/test_sensor.py +++ b/tests/components/rflink/test_sensor.py @@ -19,7 +19,7 @@ from homeassistant.const import ( TEMP_CELSIUS, ) -from tests.components.rflink.test_init import mock_rflink +from .test_init import mock_rflink DOMAIN = "sensor" diff --git a/tests/components/rflink/test_switch.py b/tests/components/rflink/test_switch.py index ef6bac55f21..7598301e5c9 100644 --- a/tests/components/rflink/test_switch.py +++ b/tests/components/rflink/test_switch.py @@ -15,8 +15,9 @@ from homeassistant.const import ( ) from homeassistant.core import CoreState, State, callback +from .test_init import mock_rflink + from tests.common import mock_restore_cache -from tests.components.rflink.test_init import mock_rflink DOMAIN = "switch" diff --git a/tests/components/rfxtrx/test_binary_sensor.py b/tests/components/rfxtrx/test_binary_sensor.py index 175b455da6b..a6643d159d0 100644 --- a/tests/components/rfxtrx/test_binary_sensor.py +++ b/tests/components/rfxtrx/test_binary_sensor.py @@ -6,8 +6,9 @@ from homeassistant.components.rfxtrx.const import ATTR_EVENT from homeassistant.const import STATE_UNKNOWN from homeassistant.core import State +from .conftest import create_rfx_test_cfg + from tests.common import MockConfigEntry, mock_restore_cache -from tests.components.rfxtrx.conftest import create_rfx_test_cfg EVENT_SMOKE_DETECTOR_PANIC = "08200300a109000670" EVENT_SMOKE_DETECTOR_NO_PANIC = "08200300a109000770" diff --git a/tests/components/rfxtrx/test_cover.py b/tests/components/rfxtrx/test_cover.py index 3be41d9233e..32e3f4d160c 100644 --- a/tests/components/rfxtrx/test_cover.py +++ b/tests/components/rfxtrx/test_cover.py @@ -7,8 +7,9 @@ from homeassistant.components.rfxtrx import DOMAIN from homeassistant.core import State from homeassistant.exceptions import HomeAssistantError +from .conftest import create_rfx_test_cfg + from tests.common import MockConfigEntry, mock_restore_cache -from tests.components.rfxtrx.conftest import create_rfx_test_cfg async def test_one_cover(hass, rfxtrx): diff --git a/tests/components/rfxtrx/test_device_action.py b/tests/components/rfxtrx/test_device_action.py index 6b61e166b2a..7dda64bbe62 100644 --- a/tests/components/rfxtrx/test_device_action.py +++ b/tests/components/rfxtrx/test_device_action.py @@ -12,6 +12,8 @@ from homeassistant.components.rfxtrx import DOMAIN from homeassistant.helpers.device_registry import DeviceRegistry from homeassistant.setup import async_setup_component +from .conftest import create_rfx_test_cfg + from tests.common import ( MockConfigEntry, assert_lists_same, @@ -19,7 +21,6 @@ from tests.common import ( mock_device_registry, mock_registry, ) -from tests.components.rfxtrx.conftest import create_rfx_test_cfg @pytest.fixture(name="device_reg") diff --git a/tests/components/rfxtrx/test_device_trigger.py b/tests/components/rfxtrx/test_device_trigger.py index 8e5ee27504b..b783d10ed27 100644 --- a/tests/components/rfxtrx/test_device_trigger.py +++ b/tests/components/rfxtrx/test_device_trigger.py @@ -11,6 +11,8 @@ from homeassistant.components.rfxtrx import DOMAIN from homeassistant.helpers.device_registry import DeviceRegistry from homeassistant.setup import async_setup_component +from .conftest import create_rfx_test_cfg + from tests.common import ( MockConfigEntry, assert_lists_same, @@ -18,7 +20,6 @@ from tests.common import ( async_mock_service, mock_device_registry, ) -from tests.components.rfxtrx.conftest import create_rfx_test_cfg class EventTestData(NamedTuple): diff --git a/tests/components/rfxtrx/test_init.py b/tests/components/rfxtrx/test_init.py index aff4a25770a..390856ffb44 100644 --- a/tests/components/rfxtrx/test_init.py +++ b/tests/components/rfxtrx/test_init.py @@ -11,8 +11,9 @@ from homeassistant.core import callback from homeassistant.helpers import device_registry as dr from homeassistant.setup import async_setup_component +from .conftest import create_rfx_test_cfg, setup_rfx_test_cfg + from tests.common import MockConfigEntry -from tests.components.rfxtrx.conftest import create_rfx_test_cfg, setup_rfx_test_cfg SOME_PROTOCOLS = ["ac", "arc"] diff --git a/tests/components/rfxtrx/test_light.py b/tests/components/rfxtrx/test_light.py index a6ff96662fb..e72c4738ea3 100644 --- a/tests/components/rfxtrx/test_light.py +++ b/tests/components/rfxtrx/test_light.py @@ -8,8 +8,9 @@ from homeassistant.components.rfxtrx import DOMAIN from homeassistant.const import STATE_UNKNOWN from homeassistant.core import State +from .conftest import create_rfx_test_cfg + from tests.common import MockConfigEntry, mock_restore_cache -from tests.components.rfxtrx.conftest import create_rfx_test_cfg async def test_one_light(hass, rfxtrx): diff --git a/tests/components/rfxtrx/test_sensor.py b/tests/components/rfxtrx/test_sensor.py index 8ba0104cf50..cd562037713 100644 --- a/tests/components/rfxtrx/test_sensor.py +++ b/tests/components/rfxtrx/test_sensor.py @@ -11,8 +11,9 @@ from homeassistant.const import ( ) from homeassistant.core import State +from .conftest import create_rfx_test_cfg + from tests.common import MockConfigEntry, mock_restore_cache -from tests.components.rfxtrx.conftest import create_rfx_test_cfg async def test_default_config(hass, rfxtrx): diff --git a/tests/components/rfxtrx/test_switch.py b/tests/components/rfxtrx/test_switch.py index 4d92c6fa332..40086b1fb0a 100644 --- a/tests/components/rfxtrx/test_switch.py +++ b/tests/components/rfxtrx/test_switch.py @@ -8,8 +8,9 @@ from homeassistant.components.rfxtrx import DOMAIN from homeassistant.const import STATE_UNKNOWN from homeassistant.core import State +from .conftest import create_rfx_test_cfg + from tests.common import MockConfigEntry, mock_restore_cache -from tests.components.rfxtrx.conftest import create_rfx_test_cfg EVENT_RFY_ENABLE_SUN_AUTO = "0C1a0000030101011300000003" EVENT_RFY_DISABLE_SUN_AUTO = "0C1a0000030101011400000003" diff --git a/tests/components/roku/test_binary_sensor.py b/tests/components/roku/test_binary_sensor.py index 706b1eceddb..9b8ca5268c4 100644 --- a/tests/components/roku/test_binary_sensor.py +++ b/tests/components/roku/test_binary_sensor.py @@ -11,8 +11,9 @@ from homeassistant.core import HomeAssistant from homeassistant.helpers import device_registry as dr, entity_registry as er from homeassistant.helpers.entity import EntityCategory +from . import UPNP_SERIAL + from tests.common import MockConfigEntry -from tests.components.roku import UPNP_SERIAL async def test_roku_binary_sensors( diff --git a/tests/components/roku/test_config_flow.py b/tests/components/roku/test_config_flow.py index bac6d7456a3..e86084e7718 100644 --- a/tests/components/roku/test_config_flow.py +++ b/tests/components/roku/test_config_flow.py @@ -11,8 +11,7 @@ from homeassistant.const import CONF_HOST, CONF_NAME, CONF_SOURCE from homeassistant.core import HomeAssistant from homeassistant.data_entry_flow import FlowResultType -from tests.common import MockConfigEntry -from tests.components.roku import ( +from . import ( HOMEKIT_HOST, HOST, MOCK_HOMEKIT_DISCOVERY_INFO, @@ -21,6 +20,8 @@ from tests.components.roku import ( UPNP_FRIENDLY_NAME, ) +from tests.common import MockConfigEntry + async def test_duplicate_error( hass: HomeAssistant, diff --git a/tests/components/roku/test_remote.py b/tests/components/roku/test_remote.py index f1685609563..df36558e22e 100644 --- a/tests/components/roku/test_remote.py +++ b/tests/components/roku/test_remote.py @@ -10,8 +10,9 @@ from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_O from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er +from . import UPNP_SERIAL + from tests.common import MockConfigEntry -from tests.components.roku import UPNP_SERIAL MAIN_ENTITY_ID = f"{REMOTE_DOMAIN}.my_roku_3" diff --git a/tests/components/roku/test_sensor.py b/tests/components/roku/test_sensor.py index 983455255fa..1942be9b687 100644 --- a/tests/components/roku/test_sensor.py +++ b/tests/components/roku/test_sensor.py @@ -14,8 +14,9 @@ from homeassistant.core import HomeAssistant from homeassistant.helpers import device_registry as dr, entity_registry as er from homeassistant.helpers.entity import EntityCategory +from . import UPNP_SERIAL + from tests.common import MockConfigEntry -from tests.components.roku import UPNP_SERIAL async def test_roku_sensors( diff --git a/tests/components/ruckus_unleashed/test_config_flow.py b/tests/components/ruckus_unleashed/test_config_flow.py index 9a93dcf78a7..b6816a710fc 100644 --- a/tests/components/ruckus_unleashed/test_config_flow.py +++ b/tests/components/ruckus_unleashed/test_config_flow.py @@ -8,8 +8,9 @@ from homeassistant import config_entries from homeassistant.components.ruckus_unleashed.const import DOMAIN from homeassistant.util import utcnow +from . import CONFIG, DEFAULT_SYSTEM_INFO, DEFAULT_TITLE + from tests.common import async_fire_time_changed -from tests.components.ruckus_unleashed import CONFIG, DEFAULT_SYSTEM_INFO, DEFAULT_TITLE async def test_form(hass): diff --git a/tests/components/ruckus_unleashed/test_device_tracker.py b/tests/components/ruckus_unleashed/test_device_tracker.py index b6a991f4c75..12dae721c90 100644 --- a/tests/components/ruckus_unleashed/test_device_tracker.py +++ b/tests/components/ruckus_unleashed/test_device_tracker.py @@ -8,8 +8,7 @@ from homeassistant.helpers import entity_registry as er from homeassistant.helpers.entity_component import async_update_entity from homeassistant.util import utcnow -from tests.common import async_fire_time_changed -from tests.components.ruckus_unleashed import ( +from . import ( DEFAULT_AP_INFO, DEFAULT_SYSTEM_INFO, DEFAULT_TITLE, @@ -20,6 +19,8 @@ from tests.components.ruckus_unleashed import ( mock_config_entry, ) +from tests.common import async_fire_time_changed + async def test_client_connected(hass): """Test client connected.""" diff --git a/tests/components/ruckus_unleashed/test_init.py b/tests/components/ruckus_unleashed/test_init.py index d72856aa542..b4ebd7b1f00 100644 --- a/tests/components/ruckus_unleashed/test_init.py +++ b/tests/components/ruckus_unleashed/test_init.py @@ -18,7 +18,7 @@ from homeassistant.config_entries import ConfigEntryState from homeassistant.helpers import device_registry as dr from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC -from tests.components.ruckus_unleashed import ( +from . import ( DEFAULT_AP_INFO, DEFAULT_SYSTEM_INFO, DEFAULT_TITLE,