Adjust homekit-controller test imports (#78731)

tests/components/homekit_controller/specific_devices/test_anker_eufycam.py

@@ -1,6 +1,6 @@
 """Test against characteristics captured from a eufycam."""
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_aqara_gateway.py

@@ -11,7 +11,7 @@ from homeassistant.components.alarm_control_panel import (
 from homeassistant.components.number import NumberMode
 from homeassistant.helpers.entity import EntityCategory
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_aqara_switch.py

@@ -10,7 +10,7 @@ https://github.com/home-assistant/core/pull/39090
 from homeassistant.components.sensor import SensorStateClass
 from homeassistant.const import PERCENTAGE
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     DeviceTriggerInfo,

tests/components/homekit_controller/specific_devices/test_arlo_baby.py

@@ -3,7 +3,7 @@
 from homeassistant.components.sensor import SensorStateClass
 from homeassistant.const import PERCENTAGE, TEMP_CELSIUS
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_connectsense.py

@@ -7,7 +7,7 @@ from homeassistant.const import (
     POWER_WATT,
 )
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_ecobee3.py

@@ -19,7 +19,7 @@ from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import TEMP_CELSIUS
 from homeassistant.helpers import entity_registry as er
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_ecobee_501.py

@@ -9,7 +9,7 @@ from homeassistant.components.climate.const import (
 )
 from homeassistant.const import STATE_ON
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_ecobee_occupancy.py

@@ -4,7 +4,7 @@ Regression tests for Ecobee occupancy.
 https://github.com/home-assistant/core/issues/31827
 """
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_eve_degree.py

@@ -5,7 +5,7 @@ from homeassistant.components.sensor import SensorStateClass
 from homeassistant.const import PERCENTAGE, PRESSURE_HPA, TEMP_CELSIUS
 from homeassistant.helpers.entity import EntityCategory
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_eve_energy.py

@@ -9,7 +9,7 @@ from homeassistant.const import (
 )
 from homeassistant.helpers.entity import EntityCategory
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_haa_fan.py

@@ -3,7 +3,7 @@
 from homeassistant.components.fan import ATTR_PERCENTAGE, SUPPORT_SET_SPEED
 from homeassistant.helpers.entity import EntityCategory
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_homeassistant_bridge.py

@@ -6,7 +6,7 @@ from homeassistant.components.fan import (
     SUPPORT_SET_SPEED,
 )
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_hue_bridge.py

@@ -3,7 +3,7 @@
 from homeassistant.components.sensor import SensorStateClass
 from homeassistant.const import PERCENTAGE
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     DeviceTriggerInfo,

tests/components/homekit_controller/specific_devices/test_koogeek_ls1.py

@@ -11,8 +11,7 @@ import pytest
 from homeassistant.helpers.entity import EntityCategory
 import homeassistant.util.dt as dt_util
 
-from tests.common import async_fire_time_changed
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,
@@ -22,6 +21,8 @@ from tests.components.homekit_controller.common import (
     setup_test_accessories,
 )
 
+from tests.common import async_fire_time_changed
+
 LIGHT_ON = ("lightbulb", "on")
 
 

tests/components/homekit_controller/specific_devices/test_koogeek_p1eu.py

@@ -3,7 +3,7 @@
 from homeassistant.components.sensor import SensorStateClass
 from homeassistant.const import POWER_WATT
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_koogeek_sw2.py

@@ -9,7 +9,7 @@ It should have 2 entities - the actual switch and a sensor for power usage.
 from homeassistant.components.sensor import SensorStateClass
 from homeassistant.const import POWER_WATT
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_lennox_e30.py

@@ -9,7 +9,7 @@ from homeassistant.components.climate.const import (
     SUPPORT_TARGET_TEMPERATURE_RANGE,
 )
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_lg_tv.py

@@ -6,7 +6,7 @@ from homeassistant.components.media_player.const import (
     SUPPORT_SELECT_SOURCE,
 )
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_lutron_caseta_bridge.py

@@ -2,7 +2,7 @@
 
 from homeassistant.const import STATE_OFF
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_mss425f.py

@@ -4,7 +4,7 @@
 from homeassistant.const import STATE_ON, STATE_UNKNOWN
 from homeassistant.helpers.entity import EntityCategory
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_mss565.py

@@ -3,7 +3,7 @@
 
 from homeassistant.const import STATE_ON
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_mysa_living.py

@@ -4,7 +4,7 @@ from homeassistant.components.climate import SUPPORT_TARGET_TEMPERATURE
 from homeassistant.components.sensor import SensorStateClass
 from homeassistant.const import PERCENTAGE, TEMP_CELSIUS
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_nanoleaf_strip_nl55.py

@@ -2,7 +2,7 @@
 
 from homeassistant.helpers.entity import EntityCategory
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_netamo_doorbell.py

@@ -4,7 +4,7 @@ Regression tests for Netamo Doorbell.
 https://github.com/home-assistant/core/issues/44596
 """
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     DeviceTriggerInfo,

tests/components/homekit_controller/specific_devices/test_rainmachine_pro_8.py

@@ -4,7 +4,7 @@ Make sure that existing RainMachine support isn't broken.
 https://github.com/home-assistant/core/issues/31745
 """
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_ryse_smart_bridge.py

@@ -8,7 +8,7 @@ from homeassistant.components.cover import (
 from homeassistant.components.sensor import SensorStateClass
 from homeassistant.const import PERCENTAGE
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_schlage_sense.py

@@ -1,7 +1,7 @@
 """Make sure that Schlage Sense is enumerated properly."""
 
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_simpleconnect_fan.py

@@ -6,7 +6,7 @@ https://github.com/home-assistant/core/issues/26180
 
 from homeassistant.components.fan import SUPPORT_DIRECTION, SUPPORT_SET_SPEED
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_velux_gateway.py

@@ -16,7 +16,7 @@ from homeassistant.const import (
     TEMP_CELSIUS,
 )
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_vocolinc_flowerbud.py

@@ -6,7 +6,7 @@ from homeassistant.components.sensor import SensorStateClass
 from homeassistant.const import PERCENTAGE
 from homeassistant.helpers.entity import EntityCategory
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/specific_devices/test_vocolinc_vp3.py

@@ -3,7 +3,7 @@
 from homeassistant.components.sensor import SensorStateClass
 from homeassistant.const import POWER_WATT
 
-from tests.components.homekit_controller.common import (
+from ..common import (
     HUB_TEST_ACCESSORY_ID,
     DeviceTestInfo,
     EntityTestInfo,

tests/components/homekit_controller/test_alarm_control_panel.py

@@ -2,7 +2,7 @@
 from aiohomekit.model.characteristics import CharacteristicsTypes
 from aiohomekit.model.services import ServicesTypes
 
-from tests.components.homekit_controller.common import setup_test_component
+from .common import setup_test_component
 
 
 def create_security_system_service(accessory):

tests/components/homekit_controller/test_binary_sensor.py

@@ -4,7 +4,7 @@ from aiohomekit.model.services import ServicesTypes
 
 from homeassistant.components.binary_sensor import BinarySensorDeviceClass
 
-from tests.components.homekit_controller.common import setup_test_component
+from .common import setup_test_component
 
 
 def create_motion_sensor_service(accessory):

tests/components/homekit_controller/test_button.py

@@ -2,7 +2,7 @@
 from aiohomekit.model.characteristics import CharacteristicsTypes
 from aiohomekit.model.services import ServicesTypes
 
-from tests.components.homekit_controller.common import Helper, setup_test_component
+from .common import Helper, setup_test_component
 
 
 def create_switch_with_setup_button(accessory):

tests/components/homekit_controller/test_camera.py

@@ -6,7 +6,7 @@ from aiohomekit.testing import FAKE_CAMERA_IMAGE
 
 from homeassistant.components import camera
 
-from tests.components.homekit_controller.common import setup_test_component
+from .common import setup_test_component
 
 
 def create_camera(accessory):

tests/components/homekit_controller/test_climate.py

@@ -18,7 +18,7 @@ from homeassistant.components.climate.const import (
     HVACMode,
 )
 
-from tests.components.homekit_controller.common import setup_test_component
+from .common import setup_test_component
 
 # Test thermostat devices
 

tests/components/homekit_controller/test_connection.py

@@ -14,12 +14,9 @@ from homeassistant.components.homekit_controller.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 
+from .common import setup_accessories_from_file, setup_platform, setup_test_accessories
+
 from tests.common import MockConfigEntry
-from tests.components.homekit_controller.common import (
-    setup_accessories_from_file,
-    setup_platform,
-    setup_test_accessories,
-)
 
 
 @dataclasses.dataclass

tests/components/homekit_controller/test_cover.py

@@ -2,7 +2,7 @@
 from aiohomekit.model.characteristics import CharacteristicsTypes
 from aiohomekit.model.services import ServicesTypes
 
-from tests.components.homekit_controller.common import setup_test_component
+from .common import setup_test_component
 
 
 def create_window_covering_service(accessory):

tests/components/homekit_controller/test_device_trigger.py

@@ -9,13 +9,14 @@ from homeassistant.components.homekit_controller.const import DOMAIN
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
 
+from .common import setup_test_component
+
 from tests.common import (
     assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
 from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
-from tests.components.homekit_controller.common import setup_test_component
 
 
 # pylint: disable=redefined-outer-name

tests/components/homekit_controller/test_diagnostics.py

@@ -5,14 +5,12 @@ from homeassistant.components.homekit_controller.const import KNOWN_DEVICES
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 
+from .common import setup_accessories_from_file, setup_test_accessories
+
 from tests.components.diagnostics import (
     get_diagnostics_for_config_entry,
     get_diagnostics_for_device,
 )
-from tests.components.homekit_controller.common import (
-    setup_accessories_from_file,
-    setup_test_accessories,
-)
 
 
 async def test_config_entry(hass: HomeAssistant, hass_client: ClientSession, utcnow):

tests/components/homekit_controller/test_fan.py

@@ -2,7 +2,7 @@
 from aiohomekit.model.characteristics import CharacteristicsTypes
 from aiohomekit.model.services import ServicesTypes
 
-from tests.components.homekit_controller.common import setup_test_component
+from .common import setup_test_component
 
 
 def create_fan_service(accessory):

tests/components/homekit_controller/test_humidifier.py

@@ -5,7 +5,7 @@ from aiohomekit.model.services import ServicesTypes
 from homeassistant.components.humidifier import DOMAIN
 from homeassistant.components.humidifier.const import MODE_AUTO, MODE_NORMAL
 
-from tests.components.homekit_controller.common import setup_test_component
+from .common import setup_test_component
 
 
 def create_humidifier_service(accessory):

tests/components/homekit_controller/test_init.py

@@ -18,10 +18,14 @@ from homeassistant.helpers.entity_registry import EntityRegistry
 from homeassistant.setup import async_setup_component
 from homeassistant.util.dt import utcnow
 
-from .common import Helper, remove_device, setup_test_accessories_with_controller
+from .common import (
+    Helper,
+    remove_device,
+    setup_test_accessories_with_controller,
+    setup_test_component,
+)
 
 from tests.common import async_fire_time_changed
-from tests.components.homekit_controller.common import setup_test_component
 
 ALIVE_DEVICE_NAME = "testdevice"
 ALIVE_DEVICE_ENTITY_ID = "light.testdevice"

tests/components/homekit_controller/test_light.py

@@ -10,7 +10,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import ATTR_SUPPORTED_FEATURES, STATE_UNAVAILABLE
 
-from tests.components.homekit_controller.common import setup_test_component
+from .common import setup_test_component
 
 LIGHT_BULB_NAME = "TestDevice"
 LIGHT_BULB_ENTITY_ID = "light.testdevice"

tests/components/homekit_controller/test_lock.py

@@ -2,7 +2,7 @@
 from aiohomekit.model.characteristics import CharacteristicsTypes
 from aiohomekit.model.services import ServicesTypes
 
-from tests.components.homekit_controller.common import setup_test_component
+from .common import setup_test_component
 
 
 def create_lock_service(accessory):

tests/components/homekit_controller/test_media_player.py

@@ -6,7 +6,7 @@ from aiohomekit.model.characteristics import (
 from aiohomekit.model.services import ServicesTypes
 import pytest
 
-from tests.components.homekit_controller.common import setup_test_component
+from .common import setup_test_component
 
 
 def create_tv_service(accessory):

tests/components/homekit_controller/test_number.py

@@ -2,7 +2,7 @@
 from aiohomekit.model.characteristics import CharacteristicsTypes
 from aiohomekit.model.services import ServicesTypes
 
-from tests.components.homekit_controller.common import Helper, setup_test_component
+from .common import Helper, setup_test_component
 
 
 def create_switch_with_spray_level(accessory):

tests/components/homekit_controller/test_select.py

@@ -3,7 +3,7 @@ from aiohomekit.model import Accessory
 from aiohomekit.model.characteristics import CharacteristicsTypes
 from aiohomekit.model.services import ServicesTypes
 
-from tests.components.homekit_controller.common import Helper, setup_test_component
+from .common import Helper, setup_test_component
 
 
 def create_service_with_ecobee_mode(accessory: Accessory):

tests/components/homekit_controller/test_sensor.py

@@ -10,7 +10,7 @@ from homeassistant.components.homekit_controller.sensor import (
 )
 from homeassistant.components.sensor import SensorDeviceClass, SensorStateClass
 
-from tests.components.homekit_controller.common import Helper, setup_test_component
+from .common import Helper, setup_test_component
 
 
 def create_temperature_sensor_service(accessory):

tests/components/homekit_controller/test_storage.py

@@ -5,11 +5,9 @@ from aiohomekit.model.services import ServicesTypes
 from homeassistant.components.homekit_controller.const import ENTITY_MAP
 from homeassistant.components.homekit_controller.storage import EntityMapStorage
 
+from .common import setup_platform, setup_test_component
+
 from tests.common import flush_store
-from tests.components.homekit_controller.common import (
-    setup_platform,
-    setup_test_component,
-)
 
 
 async def test_load_from_storage(hass, hass_storage):

tests/components/homekit_controller/test_switch.py

@@ -7,7 +7,7 @@ from aiohomekit.model.characteristics import (
 )
 from aiohomekit.model.services import ServicesTypes
 
-from tests.components.homekit_controller.common import setup_test_component
+from .common import setup_test_component
 
 
 def create_switch_service(accessory):