diff --git a/tests/components/accuweather/test_diagnostics.py b/tests/components/accuweather/test_diagnostics.py index 1936de5fad7..4e8ad3d1ea8 100644 --- a/tests/components/accuweather/test_diagnostics.py +++ b/tests/components/accuweather/test_diagnostics.py @@ -1,8 +1,9 @@ """Test AccuWeather diagnostics.""" import json +from . import init_integration + from tests.common import load_fixture -from tests.components.accuweather import init_integration from tests.components.diagnostics import get_diagnostics_for_config_entry diff --git a/tests/components/accuweather/test_init.py b/tests/components/accuweather/test_init.py index d6f76f113b3..ee91fa4d219 100644 --- a/tests/components/accuweather/test_init.py +++ b/tests/components/accuweather/test_init.py @@ -10,8 +10,9 @@ from homeassistant.config_entries import ConfigEntryState from homeassistant.const import STATE_UNAVAILABLE from homeassistant.util.dt import utcnow +from . import init_integration + from tests.common import MockConfigEntry, async_fire_time_changed, load_fixture -from tests.components.accuweather import init_integration async def test_async_setup_entry(hass): diff --git a/tests/components/accuweather/test_sensor.py b/tests/components/accuweather/test_sensor.py index a1c454ad0b7..8612a805980 100644 --- a/tests/components/accuweather/test_sensor.py +++ b/tests/components/accuweather/test_sensor.py @@ -32,8 +32,9 @@ from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow from homeassistant.util.unit_system import IMPERIAL_SYSTEM +from . import init_integration + from tests.common import async_fire_time_changed, load_fixture -from tests.components.accuweather import init_integration async def test_sensor_without_forecast(hass): diff --git a/tests/components/accuweather/test_weather.py b/tests/components/accuweather/test_weather.py index 97f588cb477..041ccd687ac 100644 --- a/tests/components/accuweather/test_weather.py +++ b/tests/components/accuweather/test_weather.py @@ -27,8 +27,9 @@ from homeassistant.helpers import entity_registry as er from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow +from . import init_integration + from tests.common import async_fire_time_changed, load_fixture -from tests.components.accuweather import init_integration async def test_weather_without_forecast(hass): diff --git a/tests/components/advantage_air/test_binary_sensor.py b/tests/components/advantage_air/test_binary_sensor.py index 4bd792808fb..ff09131a77d 100644 --- a/tests/components/advantage_air/test_binary_sensor.py +++ b/tests/components/advantage_air/test_binary_sensor.py @@ -6,8 +6,7 @@ from homeassistant.const import STATE_OFF, STATE_ON from homeassistant.helpers import entity_registry as er from homeassistant.util import dt -from tests.common import async_fire_time_changed -from tests.components.advantage_air import ( +from . import ( TEST_SET_RESPONSE, TEST_SET_URL, TEST_SYSTEM_DATA, @@ -15,6 +14,8 @@ from tests.components.advantage_air import ( add_mock_config, ) +from tests.common import async_fire_time_changed + async def test_binary_sensor_async_setup_entry(hass, aioclient_mock): """Test binary sensor setup.""" diff --git a/tests/components/advantage_air/test_config_flow.py b/tests/components/advantage_air/test_config_flow.py index 533cf2a17a4..cc9d8358d93 100644 --- a/tests/components/advantage_air/test_config_flow.py +++ b/tests/components/advantage_air/test_config_flow.py @@ -5,7 +5,7 @@ from unittest.mock import patch from homeassistant import config_entries, data_entry_flow from homeassistant.components.advantage_air.const import DOMAIN -from tests.components.advantage_air import TEST_SYSTEM_DATA, TEST_SYSTEM_URL, USER_INPUT +from . import TEST_SYSTEM_DATA, TEST_SYSTEM_URL, USER_INPUT async def test_form(hass, aioclient_mock): diff --git a/tests/components/advantage_air/test_cover.py b/tests/components/advantage_air/test_cover.py index 90cdf9a2168..e272ea15de3 100644 --- a/tests/components/advantage_air/test_cover.py +++ b/tests/components/advantage_air/test_cover.py @@ -17,7 +17,7 @@ from homeassistant.components.cover import ( from homeassistant.const import ATTR_ENTITY_ID, STATE_OPEN from homeassistant.helpers import entity_registry as er -from tests.components.advantage_air import ( +from . import ( TEST_SET_RESPONSE, TEST_SET_URL, TEST_SYSTEM_DATA, diff --git a/tests/components/advantage_air/test_init.py b/tests/components/advantage_air/test_init.py index ca8ecff359e..88591922295 100644 --- a/tests/components/advantage_air/test_init.py +++ b/tests/components/advantage_air/test_init.py @@ -2,11 +2,7 @@ from homeassistant.config_entries import ConfigEntryState -from tests.components.advantage_air import ( - TEST_SYSTEM_DATA, - TEST_SYSTEM_URL, - add_mock_config, -) +from . import TEST_SYSTEM_DATA, TEST_SYSTEM_URL, add_mock_config async def test_async_setup_entry(hass, aioclient_mock): diff --git a/tests/components/advantage_air/test_light.py b/tests/components/advantage_air/test_light.py index 85223700dbf..a259c1dc01b 100644 --- a/tests/components/advantage_air/test_light.py +++ b/tests/components/advantage_air/test_light.py @@ -14,7 +14,7 @@ from homeassistant.components.light import ( from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF from homeassistant.helpers import entity_registry as er -from tests.components.advantage_air import ( +from . import ( TEST_SET_LIGHT_URL, TEST_SET_RESPONSE, TEST_SYSTEM_DATA, diff --git a/tests/components/advantage_air/test_select.py b/tests/components/advantage_air/test_select.py index 20d42fdcffc..b8493c8ec45 100644 --- a/tests/components/advantage_air/test_select.py +++ b/tests/components/advantage_air/test_select.py @@ -9,7 +9,7 @@ from homeassistant.components.select.const import ( from homeassistant.const import ATTR_ENTITY_ID from homeassistant.helpers import entity_registry as er -from tests.components.advantage_air import ( +from . import ( TEST_SET_RESPONSE, TEST_SET_URL, TEST_SYSTEM_DATA, diff --git a/tests/components/advantage_air/test_sensor.py b/tests/components/advantage_air/test_sensor.py index 4dc2f1baaff..2489a336451 100644 --- a/tests/components/advantage_air/test_sensor.py +++ b/tests/components/advantage_air/test_sensor.py @@ -13,8 +13,7 @@ from homeassistant.const import ATTR_ENTITY_ID from homeassistant.helpers import entity_registry as er from homeassistant.util import dt -from tests.common import async_fire_time_changed -from tests.components.advantage_air import ( +from . import ( TEST_SET_RESPONSE, TEST_SET_URL, TEST_SYSTEM_DATA, @@ -22,6 +21,8 @@ from tests.components.advantage_air import ( add_mock_config, ) +from tests.common import async_fire_time_changed + async def test_sensor_platform(hass, aioclient_mock): """Test sensor platform.""" diff --git a/tests/components/advantage_air/test_switch.py b/tests/components/advantage_air/test_switch.py index be78edf8ffe..6e16d8d743a 100644 --- a/tests/components/advantage_air/test_switch.py +++ b/tests/components/advantage_air/test_switch.py @@ -13,7 +13,7 @@ from homeassistant.components.switch import ( from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF from homeassistant.helpers import entity_registry as er -from tests.components.advantage_air import ( +from . import ( TEST_SET_RESPONSE, TEST_SET_URL, TEST_SYSTEM_DATA, diff --git a/tests/components/advantage_air/test_update.py b/tests/components/advantage_air/test_update.py index 2fef887997f..d70f59b2bbb 100644 --- a/tests/components/advantage_air/test_update.py +++ b/tests/components/advantage_air/test_update.py @@ -3,8 +3,9 @@ from homeassistant.const import STATE_ON from homeassistant.helpers import entity_registry as er +from . import TEST_SYSTEM_URL, add_mock_config + from tests.common import load_fixture -from tests.components.advantage_air import TEST_SYSTEM_URL, add_mock_config async def test_update_platform(hass, aioclient_mock): diff --git a/tests/components/agent_dvr/test_init.py b/tests/components/agent_dvr/test_init.py index 27b3652a446..9166d51675b 100644 --- a/tests/components/agent_dvr/test_init.py +++ b/tests/components/agent_dvr/test_init.py @@ -7,9 +7,8 @@ from homeassistant.components.agent_dvr.const import DOMAIN from homeassistant.config_entries import ConfigEntryState from homeassistant.core import HomeAssistant -from . import CONF_DATA, create_entry +from . import CONF_DATA, create_entry, init_integration -from tests.components.agent_dvr import init_integration from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/airly/test_diagnostics.py b/tests/components/airly/test_diagnostics.py index fabe4f262ea..82be698311a 100644 --- a/tests/components/airly/test_diagnostics.py +++ b/tests/components/airly/test_diagnostics.py @@ -3,8 +3,9 @@ import json from homeassistant.components.diagnostics import REDACTED +from . import init_integration + from tests.common import load_fixture -from tests.components.airly import init_integration from tests.components.diagnostics import get_diagnostics_for_config_entry diff --git a/tests/components/airly/test_init.py b/tests/components/airly/test_init.py index 7e1d0797b20..5e76e96305e 100644 --- a/tests/components/airly/test_init.py +++ b/tests/components/airly/test_init.py @@ -11,7 +11,7 @@ from homeassistant.const import STATE_UNAVAILABLE from homeassistant.helpers import entity_registry as er from homeassistant.util.dt import utcnow -from . import API_POINT_URL +from . import API_POINT_URL, init_integration from tests.common import ( MockConfigEntry, @@ -19,7 +19,6 @@ from tests.common import ( load_fixture, mock_device_registry, ) -from tests.components.airly import init_integration async def test_async_setup_entry(hass, aioclient_mock): diff --git a/tests/components/airly/test_sensor.py b/tests/components/airly/test_sensor.py index d7717e3886a..d6bf4970130 100644 --- a/tests/components/airly/test_sensor.py +++ b/tests/components/airly/test_sensor.py @@ -22,10 +22,9 @@ from homeassistant.helpers import entity_registry as er from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow -from . import API_POINT_URL +from . import API_POINT_URL, init_integration from tests.common import async_fire_time_changed, load_fixture -from tests.components.airly import init_integration async def test_sensor(hass, aioclient_mock): diff --git a/tests/components/amberelectric/test_binary_sensor.py b/tests/components/amberelectric/test_binary_sensor.py index b5d6504447e..32cec180dbc 100644 --- a/tests/components/amberelectric/test_binary_sensor.py +++ b/tests/components/amberelectric/test_binary_sensor.py @@ -19,12 +19,9 @@ from homeassistant.components.amberelectric.const import ( from homeassistant.core import HomeAssistant from homeassistant.setup import async_setup_component +from .helpers import GENERAL_CHANNEL, GENERAL_ONLY_SITE_ID, generate_current_interval + from tests.common import MockConfigEntry -from tests.components.amberelectric.helpers import ( - GENERAL_CHANNEL, - GENERAL_ONLY_SITE_ID, - generate_current_interval, -) MOCK_API_TOKEN = "psk_0000000000000000" diff --git a/tests/components/amberelectric/test_coordinator.py b/tests/components/amberelectric/test_coordinator.py index 924cd5249c0..64fa39192a6 100644 --- a/tests/components/amberelectric/test_coordinator.py +++ b/tests/components/amberelectric/test_coordinator.py @@ -19,7 +19,7 @@ from homeassistant.components.amberelectric.coordinator import ( from homeassistant.core import HomeAssistant from homeassistant.helpers.update_coordinator import UpdateFailed -from tests.components.amberelectric.helpers import ( +from .helpers import ( CONTROLLED_LOAD_CHANNEL, FEED_IN_CHANNEL, GENERAL_AND_CONTROLLED_SITE_ID, diff --git a/tests/components/amberelectric/test_sensor.py b/tests/components/amberelectric/test_sensor.py index 08103576b49..7a35b2c1c7e 100644 --- a/tests/components/amberelectric/test_sensor.py +++ b/tests/components/amberelectric/test_sensor.py @@ -15,8 +15,7 @@ from homeassistant.components.amberelectric.const import ( from homeassistant.core import HomeAssistant from homeassistant.setup import async_setup_component -from tests.common import MockConfigEntry -from tests.components.amberelectric.helpers import ( +from .helpers import ( CONTROLLED_LOAD_CHANNEL, FEED_IN_CHANNEL, GENERAL_AND_CONTROLLED_SITE_ID, @@ -25,6 +24,8 @@ from tests.components.amberelectric.helpers import ( GENERAL_ONLY_SITE_ID, ) +from tests.common import MockConfigEntry + MOCK_API_TOKEN = "psk_0000000000000000" diff --git a/tests/components/atag/test_climate.py b/tests/components/atag/test_climate.py index 115eb4035df..2369859a8e6 100644 --- a/tests/components/atag/test_climate.py +++ b/tests/components/atag/test_climate.py @@ -23,7 +23,8 @@ from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er from homeassistant.setup import async_setup_component -from tests.components.atag import UID, init_integration +from . import UID, init_integration + from tests.test_util.aiohttp import AiohttpClientMocker CLIMATE_ID = f"{Platform.CLIMATE}.{DOMAIN}" diff --git a/tests/components/atag/test_sensors.py b/tests/components/atag/test_sensors.py index aeefcb2789b..58a687512e2 100644 --- a/tests/components/atag/test_sensors.py +++ b/tests/components/atag/test_sensors.py @@ -3,7 +3,8 @@ from homeassistant.components.atag.sensor import SENSORS from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er -from tests.components.atag import UID, init_integration +from . import UID, init_integration + from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/atag/test_water_heater.py b/tests/components/atag/test_water_heater.py index 3372e8c69fa..428ff890116 100644 --- a/tests/components/atag/test_water_heater.py +++ b/tests/components/atag/test_water_heater.py @@ -10,7 +10,8 @@ from homeassistant.const import ATTR_ENTITY_ID, ATTR_TEMPERATURE, Platform from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er -from tests.components.atag import UID, init_integration +from . import UID, init_integration + from tests.test_util.aiohttp import AiohttpClientMocker WATER_HEATER_ID = f"{Platform.WATER_HEATER}.{DOMAIN}" diff --git a/tests/components/august/test_binary_sensor.py b/tests/components/august/test_binary_sensor.py index e2ff4a6771a..d062d30ba3f 100644 --- a/tests/components/august/test_binary_sensor.py +++ b/tests/components/august/test_binary_sensor.py @@ -17,8 +17,7 @@ from homeassistant.const import ( from homeassistant.helpers import device_registry as dr import homeassistant.util.dt as dt_util -from tests.common import async_fire_time_changed -from tests.components.august.mocks import ( +from .mocks import ( _create_august_with_devices, _mock_activities_from_fixture, _mock_doorbell_from_fixture, @@ -26,6 +25,8 @@ from tests.components.august.mocks import ( _mock_lock_from_fixture, ) +from tests.common import async_fire_time_changed + def _timetoken(): return str(time.time_ns())[:-2] diff --git a/tests/components/august/test_button.py b/tests/components/august/test_button.py index 2d3e6caf884..485bf4a7972 100644 --- a/tests/components/august/test_button.py +++ b/tests/components/august/test_button.py @@ -4,10 +4,7 @@ from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN from homeassistant.components.button.const import SERVICE_PRESS from homeassistant.const import ATTR_ENTITY_ID -from tests.components.august.mocks import ( - _create_august_api_with_devices, - _mock_lock_from_fixture, -) +from .mocks import _create_august_api_with_devices, _mock_lock_from_fixture async def test_wake_lock(hass): diff --git a/tests/components/august/test_camera.py b/tests/components/august/test_camera.py index 3c5379aa59e..8b93e5aff60 100644 --- a/tests/components/august/test_camera.py +++ b/tests/components/august/test_camera.py @@ -5,10 +5,7 @@ from unittest.mock import patch from homeassistant.const import STATE_IDLE -from tests.components.august.mocks import ( - _create_august_with_devices, - _mock_doorbell_from_fixture, -) +from .mocks import _create_august_with_devices, _mock_doorbell_from_fixture async def test_create_doorbell(hass, hass_client_no_auth): diff --git a/tests/components/august/test_diagnostics.py b/tests/components/august/test_diagnostics.py index 520daa91f91..0b65b6eea3e 100644 --- a/tests/components/august/test_diagnostics.py +++ b/tests/components/august/test_diagnostics.py @@ -1,10 +1,11 @@ """Test august diagnostics.""" -from tests.components.august.mocks import ( +from .mocks import ( _create_august_api_with_devices, _mock_doorbell_from_fixture, _mock_lock_from_fixture, ) + from tests.components.diagnostics import get_diagnostics_for_config_entry diff --git a/tests/components/august/test_gateway.py b/tests/components/august/test_gateway.py index 54a5e9321f2..724fa4482c3 100644 --- a/tests/components/august/test_gateway.py +++ b/tests/components/august/test_gateway.py @@ -6,7 +6,7 @@ from yalexs.authenticator_common import AuthenticationState from homeassistant.components.august.const import DOMAIN from homeassistant.components.august.gateway import AugustGateway -from tests.components.august.mocks import _mock_august_authentication, _mock_get_config +from .mocks import _mock_august_authentication, _mock_get_config async def test_refresh_access_token(hass): diff --git a/tests/components/august/test_init.py b/tests/components/august/test_init.py index ab3269e9ac8..a4bc3d7b16f 100644 --- a/tests/components/august/test_init.py +++ b/tests/components/august/test_init.py @@ -21,8 +21,7 @@ from homeassistant.helpers import device_registry as dr, entity_registry as er from homeassistant.helpers.entity_registry import EntityRegistry from homeassistant.setup import async_setup_component -from tests.common import MockConfigEntry -from tests.components.august.mocks import ( +from .mocks import ( _create_august_with_devices, _mock_august_authentication, _mock_doorsense_enabled_august_lock_detail, @@ -33,6 +32,8 @@ from tests.components.august.mocks import ( _mock_operative_august_lock_detail, ) +from tests.common import MockConfigEntry + async def test_august_api_is_failing(hass): """Config entry state is SETUP_RETRY when august api is failing.""" diff --git a/tests/components/august/test_lock.py b/tests/components/august/test_lock.py index 56f55138e36..e1b2a2b1bed 100644 --- a/tests/components/august/test_lock.py +++ b/tests/components/august/test_lock.py @@ -24,14 +24,15 @@ from homeassistant.const import ( from homeassistant.helpers import device_registry as dr, entity_registry as er import homeassistant.util.dt as dt_util -from tests.common import async_fire_time_changed -from tests.components.august.mocks import ( +from .mocks import ( _create_august_with_devices, _mock_activities_from_fixture, _mock_doorsense_enabled_august_lock_detail, _mock_lock_from_fixture, ) +from tests.common import async_fire_time_changed + async def test_lock_device_registry(hass): """Test creation of a lock with doorsense and bridge ands up in the registry.""" diff --git a/tests/components/august/test_sensor.py b/tests/components/august/test_sensor.py index 254f88ef4e9..1ed237ecf1f 100644 --- a/tests/components/august/test_sensor.py +++ b/tests/components/august/test_sensor.py @@ -2,7 +2,7 @@ from homeassistant.const import ATTR_UNIT_OF_MEASUREMENT, PERCENTAGE, STATE_UNKNOWN from homeassistant.helpers import entity_registry as er -from tests.components.august.mocks import ( +from .mocks import ( _create_august_with_devices, _mock_activities_from_fixture, _mock_doorbell_from_fixture, diff --git a/tests/components/brother/test_diagnostics.py b/tests/components/brother/test_diagnostics.py index 73b3b6dda7a..bebd536c809 100644 --- a/tests/components/brother/test_diagnostics.py +++ b/tests/components/brother/test_diagnostics.py @@ -9,8 +9,9 @@ from aiohttp import ClientSession from homeassistant.core import HomeAssistant from homeassistant.util.dt import UTC +from . import init_integration + from tests.common import load_fixture -from tests.components.brother import init_integration from tests.components.diagnostics import get_diagnostics_for_config_entry diff --git a/tests/components/brother/test_init.py b/tests/components/brother/test_init.py index b034259974a..cd439a3a41f 100644 --- a/tests/components/brother/test_init.py +++ b/tests/components/brother/test_init.py @@ -9,8 +9,9 @@ from homeassistant.config_entries import ConfigEntryState from homeassistant.const import CONF_HOST, CONF_TYPE, STATE_UNAVAILABLE from homeassistant.core import HomeAssistant +from . import init_integration + from tests.common import MockConfigEntry -from tests.components.brother import init_integration async def test_async_setup_entry(hass: HomeAssistant) -> None: diff --git a/tests/components/brother/test_sensor.py b/tests/components/brother/test_sensor.py index f50104c0b3a..9212e12e5b3 100644 --- a/tests/components/brother/test_sensor.py +++ b/tests/components/brother/test_sensor.py @@ -24,8 +24,9 @@ from homeassistant.helpers import entity_registry as er from homeassistant.setup import async_setup_component from homeassistant.util.dt import UTC, utcnow +from . import init_integration + from tests.common import async_fire_time_changed, load_fixture -from tests.components.brother import init_integration ATTR_REMAINING_PAGES = "remaining_pages" ATTR_COUNTER = "counter" diff --git a/tests/components/bsblan/test_init.py b/tests/components/bsblan/test_init.py index c7937daf786..147ba46cb5b 100644 --- a/tests/components/bsblan/test_init.py +++ b/tests/components/bsblan/test_init.py @@ -5,7 +5,8 @@ from homeassistant.components.bsblan.const import DOMAIN from homeassistant.config_entries import ConfigEntryState from homeassistant.core import HomeAssistant -from tests.components.bsblan import init_integration, init_integration_without_auth +from . import init_integration, init_integration_without_auth + from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/coinbase/test_diagnostics.py b/tests/components/coinbase/test_diagnostics.py index b19f5c94d1b..f997b02f853 100644 --- a/tests/components/coinbase/test_diagnostics.py +++ b/tests/components/coinbase/test_diagnostics.py @@ -10,11 +10,8 @@ from .common import ( mock_get_exchange_rates, mocked_get_accounts, ) +from .const import MOCK_ACCOUNTS_RESPONSE_REDACTED, MOCK_ENTRY_REDACTED -from tests.components.coinbase.const import ( - MOCK_ACCOUNTS_RESPONSE_REDACTED, - MOCK_ENTRY_REDACTED, -) from tests.components.diagnostics import get_diagnostics_for_config_entry diff --git a/tests/components/counter/test_init.py b/tests/components/counter/test_init.py index 90885be770d..eb0907d87d4 100644 --- a/tests/components/counter/test_init.py +++ b/tests/components/counter/test_init.py @@ -24,12 +24,9 @@ from homeassistant.core import Context, CoreState, State from homeassistant.helpers import entity_registry as er from homeassistant.setup import async_setup_component +from .common import async_decrement, async_increment, async_reset + from tests.common import mock_restore_cache -from tests.components.counter.common import ( - async_decrement, - async_increment, - async_reset, -) _LOGGER = logging.getLogger(__name__)