From ab53b49d3f29e3bd0950d3d9ce9a76cf8a554787 Mon Sep 17 00:00:00 2001 From: tkdrob Date: Tue, 2 Mar 2021 06:52:00 -0500 Subject: [PATCH] Clean up constants (#46948) * Clean up constants * clean up humidifier constants * fix tests * fix prometheus tests Co-authored-by: Tobias Sauerwein --- .../components/google_assistant/trait.py | 7 ++++--- homeassistant/components/humidifier/const.py | 2 -- .../components/humidifier/device_action.py | 7 ++++--- .../components/humidifier/device_condition.py | 5 +++-- homeassistant/components/humidifier/intent.py | 3 +-- .../components/humidifier/reproduce_state.py | 16 +++++++-------- .../components/input_select/__init__.py | 2 +- homeassistant/components/ipp/const.py | 1 - homeassistant/components/ipp/sensor.py | 3 +-- homeassistant/components/melcloud/sensor.py | 4 ++-- .../components/mobile_app/__init__.py | 3 +-- .../components/mobile_app/config_flow.py | 3 ++- homeassistant/components/mobile_app/const.py | 1 - .../components/mobile_app/device_tracker.py | 8 ++++++-- .../components/mobile_app/helpers.py | 8 ++++++-- .../components/mobile_app/http_api.py | 3 +-- .../components/mobile_app/webhook.py | 2 +- homeassistant/components/netatmo/const.py | 1 - homeassistant/components/ombi/__init__.py | 2 +- homeassistant/components/ombi/const.py | 1 - .../components/prometheus/__init__.py | 2 +- homeassistant/components/pushsafer/notify.py | 3 +-- homeassistant/components/remote/__init__.py | 2 +- homeassistant/components/sesame/lock.py | 2 +- tests/components/demo/test_humidifier.py | 2 +- .../google_assistant/test_google_assistant.py | 2 +- .../components/google_assistant/test_trait.py | 3 ++- .../humidifier/test_device_condition.py | 20 +++++++------------ .../humidifier/test_device_trigger.py | 8 ++++---- tests/components/humidifier/test_intent.py | 2 +- .../humidifier/test_reproduce_state.py | 9 +++++++-- 31 files changed, 69 insertions(+), 68 deletions(-) diff --git a/homeassistant/components/google_assistant/trait.py b/homeassistant/components/google_assistant/trait.py index 8b0bde09010..be7ceb98ad3 100644 --- a/homeassistant/components/google_assistant/trait.py +++ b/homeassistant/components/google_assistant/trait.py @@ -27,6 +27,7 @@ from homeassistant.const import ( ATTR_CODE, ATTR_DEVICE_CLASS, ATTR_ENTITY_ID, + ATTR_MODE, ATTR_SUPPORTED_FEATURES, ATTR_TEMPERATURE, CAST_APP_ID_HOMEASSISTANT, @@ -1424,8 +1425,8 @@ class ModesTrait(_Trait): elif self.state.domain == input_select.DOMAIN: mode_settings["option"] = self.state.state elif self.state.domain == humidifier.DOMAIN: - if humidifier.ATTR_MODE in attrs: - mode_settings["mode"] = attrs.get(humidifier.ATTR_MODE) + if ATTR_MODE in attrs: + mode_settings["mode"] = attrs.get(ATTR_MODE) elif self.state.domain == light.DOMAIN: if light.ATTR_EFFECT in attrs: mode_settings["effect"] = attrs.get(light.ATTR_EFFECT) @@ -1460,7 +1461,7 @@ class ModesTrait(_Trait): humidifier.DOMAIN, humidifier.SERVICE_SET_MODE, { - humidifier.ATTR_MODE: requested_mode, + ATTR_MODE: requested_mode, ATTR_ENTITY_ID: self.state.entity_id, }, blocking=True, diff --git a/homeassistant/components/humidifier/const.py b/homeassistant/components/humidifier/const.py index 7e70c51df28..c2508770187 100644 --- a/homeassistant/components/humidifier/const.py +++ b/homeassistant/components/humidifier/const.py @@ -1,6 +1,4 @@ """Provides the constants needed for component.""" -from homeassistant.const import ATTR_MODE # noqa: F401 pylint: disable=unused-import - MODE_NORMAL = "normal" MODE_ECO = "eco" MODE_AWAY = "away" diff --git a/homeassistant/components/humidifier/device_action.py b/homeassistant/components/humidifier/device_action.py index 6bccd375207..c702a7c2a2d 100644 --- a/homeassistant/components/humidifier/device_action.py +++ b/homeassistant/components/humidifier/device_action.py @@ -6,6 +6,7 @@ import voluptuous as vol from homeassistant.components.device_automation import toggle_entity from homeassistant.const import ( ATTR_ENTITY_ID, + ATTR_MODE, ATTR_SUPPORTED_FEATURES, CONF_DEVICE_ID, CONF_DOMAIN, @@ -30,7 +31,7 @@ SET_MODE_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend( { vol.Required(CONF_TYPE): "set_mode", vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN), - vol.Required(const.ATTR_MODE): cv.string, + vol.Required(ATTR_MODE): cv.string, } ) @@ -90,7 +91,7 @@ async def async_call_action_from_config( service_data[const.ATTR_HUMIDITY] = config[const.ATTR_HUMIDITY] elif config[CONF_TYPE] == "set_mode": service = const.SERVICE_SET_MODE - service_data[const.ATTR_MODE] = config[const.ATTR_MODE] + service_data[ATTR_MODE] = config[ATTR_MODE] else: return await toggle_entity.async_call_action_from_config( hass, config, variables, context, DOMAIN @@ -115,7 +116,7 @@ async def async_get_action_capabilities(hass, config): available_modes = state.attributes.get(const.ATTR_AVAILABLE_MODES, []) else: available_modes = [] - fields[vol.Required(const.ATTR_MODE)] = vol.In(available_modes) + fields[vol.Required(ATTR_MODE)] = vol.In(available_modes) else: return {} diff --git a/homeassistant/components/humidifier/device_condition.py b/homeassistant/components/humidifier/device_condition.py index 714a51ab016..86a049d838b 100644 --- a/homeassistant/components/humidifier/device_condition.py +++ b/homeassistant/components/humidifier/device_condition.py @@ -6,6 +6,7 @@ import voluptuous as vol from homeassistant.components.device_automation import toggle_entity from homeassistant.const import ( ATTR_ENTITY_ID, + ATTR_MODE, ATTR_SUPPORTED_FEATURES, CONF_CONDITION, CONF_DEVICE_ID, @@ -28,7 +29,7 @@ MODE_CONDITION = DEVICE_CONDITION_BASE_SCHEMA.extend( { vol.Required(CONF_ENTITY_ID): cv.entity_id, vol.Required(CONF_TYPE): "is_mode", - vol.Required(const.ATTR_MODE): str, + vol.Required(ATTR_MODE): str, } ) @@ -72,7 +73,7 @@ def async_condition_from_config( config = CONDITION_SCHEMA(config) if config[CONF_TYPE] == "is_mode": - attribute = const.ATTR_MODE + attribute = ATTR_MODE else: return toggle_entity.async_condition_from_config(config) diff --git a/homeassistant/components/humidifier/intent.py b/homeassistant/components/humidifier/intent.py index fafbb0a494a..d9ecafbc537 100644 --- a/homeassistant/components/humidifier/intent.py +++ b/homeassistant/components/humidifier/intent.py @@ -1,7 +1,7 @@ """Intents for the humidifier integration.""" import voluptuous as vol -from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF +from homeassistant.const import ATTR_ENTITY_ID, ATTR_MODE, STATE_OFF from homeassistant.core import HomeAssistant from homeassistant.helpers import intent import homeassistant.helpers.config_validation as cv @@ -9,7 +9,6 @@ import homeassistant.helpers.config_validation as cv from . import ( ATTR_AVAILABLE_MODES, ATTR_HUMIDITY, - ATTR_MODE, DOMAIN, SERVICE_SET_HUMIDITY, SERVICE_SET_MODE, diff --git a/homeassistant/components/humidifier/reproduce_state.py b/homeassistant/components/humidifier/reproduce_state.py index e9b1777d63f..f6fff75203e 100644 --- a/homeassistant/components/humidifier/reproduce_state.py +++ b/homeassistant/components/humidifier/reproduce_state.py @@ -3,17 +3,17 @@ import asyncio import logging from typing import Any, Dict, Iterable, Optional -from homeassistant.const import SERVICE_TURN_OFF, SERVICE_TURN_ON, STATE_OFF, STATE_ON +from homeassistant.const import ( + ATTR_MODE, + SERVICE_TURN_OFF, + SERVICE_TURN_ON, + STATE_OFF, + STATE_ON, +) from homeassistant.core import Context, State from homeassistant.helpers.typing import HomeAssistantType -from .const import ( - ATTR_HUMIDITY, - ATTR_MODE, - DOMAIN, - SERVICE_SET_HUMIDITY, - SERVICE_SET_MODE, -) +from .const import ATTR_HUMIDITY, DOMAIN, SERVICE_SET_HUMIDITY, SERVICE_SET_MODE _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/input_select/__init__.py b/homeassistant/components/input_select/__init__.py index f6831dc3e88..5c10c33421a 100644 --- a/homeassistant/components/input_select/__init__.py +++ b/homeassistant/components/input_select/__init__.py @@ -8,6 +8,7 @@ import voluptuous as vol from homeassistant.const import ( ATTR_EDITABLE, + ATTR_OPTION, CONF_ICON, CONF_ID, CONF_NAME, @@ -29,7 +30,6 @@ DOMAIN = "input_select" CONF_INITIAL = "initial" CONF_OPTIONS = "options" -ATTR_OPTION = "option" ATTR_OPTIONS = "options" ATTR_CYCLE = "cycle" diff --git a/homeassistant/components/ipp/const.py b/homeassistant/components/ipp/const.py index a5345f4145e..d482f2d73e4 100644 --- a/homeassistant/components/ipp/const.py +++ b/homeassistant/components/ipp/const.py @@ -7,7 +7,6 @@ DOMAIN = "ipp" ATTR_COMMAND_SET = "command_set" ATTR_IDENTIFIERS = "identifiers" ATTR_INFO = "info" -ATTR_LOCATION = "location" ATTR_MANUFACTURER = "manufacturer" ATTR_MARKER_TYPE = "marker_type" ATTR_MARKER_LOW_LEVEL = "marker_low_level" diff --git a/homeassistant/components/ipp/sensor.py b/homeassistant/components/ipp/sensor.py index 6991e6d19ea..a278f6e8ef9 100644 --- a/homeassistant/components/ipp/sensor.py +++ b/homeassistant/components/ipp/sensor.py @@ -3,7 +3,7 @@ from datetime import timedelta from typing import Any, Callable, Dict, List, Optional from homeassistant.config_entries import ConfigEntry -from homeassistant.const import DEVICE_CLASS_TIMESTAMP, PERCENTAGE +from homeassistant.const import ATTR_LOCATION, DEVICE_CLASS_TIMESTAMP, PERCENTAGE from homeassistant.helpers.entity import Entity from homeassistant.helpers.typing import HomeAssistantType from homeassistant.util.dt import utcnow @@ -12,7 +12,6 @@ from . import IPPDataUpdateCoordinator, IPPEntity from .const import ( ATTR_COMMAND_SET, ATTR_INFO, - ATTR_LOCATION, ATTR_MARKER_HIGH_LEVEL, ATTR_MARKER_LOW_LEVEL, ATTR_MARKER_TYPE, diff --git a/homeassistant/components/melcloud/sensor.py b/homeassistant/components/melcloud/sensor.py index c96433f17df..bd85d1b13bc 100644 --- a/homeassistant/components/melcloud/sensor.py +++ b/homeassistant/components/melcloud/sensor.py @@ -3,6 +3,8 @@ from pymelcloud import DEVICE_TYPE_ATA, DEVICE_TYPE_ATW from pymelcloud.atw_device import Zone from homeassistant.const import ( + ATTR_DEVICE_CLASS, + ATTR_ICON, DEVICE_CLASS_TEMPERATURE, ENERGY_KILO_WATT_HOUR, TEMP_CELSIUS, @@ -13,9 +15,7 @@ from . import MelCloudDevice from .const import DOMAIN ATTR_MEASUREMENT_NAME = "measurement_name" -ATTR_ICON = "icon" ATTR_UNIT = "unit" -ATTR_DEVICE_CLASS = "device_class" ATTR_VALUE_FN = "value_fn" ATTR_ENABLED_FN = "enabled" diff --git a/homeassistant/components/mobile_app/__init__.py b/homeassistant/components/mobile_app/__init__.py index 54fa3398ee2..e1476270844 100644 --- a/homeassistant/components/mobile_app/__init__.py +++ b/homeassistant/components/mobile_app/__init__.py @@ -6,12 +6,11 @@ from homeassistant.components.webhook import ( async_register as webhook_register, async_unregister as webhook_unregister, ) -from homeassistant.const import CONF_WEBHOOK_ID +from homeassistant.const import ATTR_DEVICE_ID, CONF_WEBHOOK_ID from homeassistant.helpers import device_registry as dr, discovery from homeassistant.helpers.typing import ConfigType, HomeAssistantType from .const import ( - ATTR_DEVICE_ID, ATTR_DEVICE_NAME, ATTR_MANUFACTURER, ATTR_MODEL, diff --git a/homeassistant/components/mobile_app/config_flow.py b/homeassistant/components/mobile_app/config_flow.py index 80b6c8db5e1..752ef86d68d 100644 --- a/homeassistant/components/mobile_app/config_flow.py +++ b/homeassistant/components/mobile_app/config_flow.py @@ -3,9 +3,10 @@ import uuid from homeassistant import config_entries from homeassistant.components import person +from homeassistant.const import ATTR_DEVICE_ID from homeassistant.helpers import entity_registry as er -from .const import ATTR_APP_ID, ATTR_DEVICE_ID, ATTR_DEVICE_NAME, CONF_USER_ID, DOMAIN +from .const import ATTR_APP_ID, ATTR_DEVICE_NAME, CONF_USER_ID, DOMAIN @config_entries.HANDLERS.register(DOMAIN) diff --git a/homeassistant/components/mobile_app/const.py b/homeassistant/components/mobile_app/const.py index b603e117c4c..af828ce423e 100644 --- a/homeassistant/components/mobile_app/const.py +++ b/homeassistant/components/mobile_app/const.py @@ -20,7 +20,6 @@ ATTR_APP_ID = "app_id" ATTR_APP_NAME = "app_name" ATTR_APP_VERSION = "app_version" ATTR_CONFIG_ENTRY_ID = "entry_id" -ATTR_DEVICE_ID = "device_id" ATTR_DEVICE_NAME = "device_name" ATTR_MANUFACTURER = "manufacturer" ATTR_MODEL = "model" diff --git a/homeassistant/components/mobile_app/device_tracker.py b/homeassistant/components/mobile_app/device_tracker.py index d2e987066ef..f0cd30074fa 100644 --- a/homeassistant/components/mobile_app/device_tracker.py +++ b/homeassistant/components/mobile_app/device_tracker.py @@ -7,14 +7,18 @@ from homeassistant.components.device_tracker import ( ) from homeassistant.components.device_tracker.config_entry import TrackerEntity from homeassistant.components.device_tracker.const import SOURCE_TYPE_GPS -from homeassistant.const import ATTR_BATTERY_LEVEL, ATTR_LATITUDE, ATTR_LONGITUDE +from homeassistant.const import ( + ATTR_BATTERY_LEVEL, + ATTR_DEVICE_ID, + ATTR_LATITUDE, + ATTR_LONGITUDE, +) from homeassistant.core import callback from homeassistant.helpers.restore_state import RestoreEntity from .const import ( ATTR_ALTITUDE, ATTR_COURSE, - ATTR_DEVICE_ID, ATTR_DEVICE_NAME, ATTR_SPEED, ATTR_VERTICAL_ACCURACY, diff --git a/homeassistant/components/mobile_app/helpers.py b/homeassistant/components/mobile_app/helpers.py index a9079be4f04..fed322df464 100644 --- a/homeassistant/components/mobile_app/helpers.py +++ b/homeassistant/components/mobile_app/helpers.py @@ -7,7 +7,12 @@ from aiohttp.web import Response, json_response from nacl.encoding import Base64Encoder from nacl.secret import SecretBox -from homeassistant.const import CONTENT_TYPE_JSON, HTTP_BAD_REQUEST, HTTP_OK +from homeassistant.const import ( + ATTR_DEVICE_ID, + CONTENT_TYPE_JSON, + HTTP_BAD_REQUEST, + HTTP_OK, +) from homeassistant.core import Context from homeassistant.helpers.json import JSONEncoder from homeassistant.helpers.typing import HomeAssistantType @@ -17,7 +22,6 @@ from .const import ( ATTR_APP_ID, ATTR_APP_NAME, ATTR_APP_VERSION, - ATTR_DEVICE_ID, ATTR_DEVICE_NAME, ATTR_MANUFACTURER, ATTR_MODEL, diff --git a/homeassistant/components/mobile_app/http_api.py b/homeassistant/components/mobile_app/http_api.py index a5a96b83bc6..4bd8d0cd76b 100644 --- a/homeassistant/components/mobile_app/http_api.py +++ b/homeassistant/components/mobile_app/http_api.py @@ -9,7 +9,7 @@ import voluptuous as vol from homeassistant.components.http import HomeAssistantView from homeassistant.components.http.data_validator import RequestDataValidator -from homeassistant.const import CONF_WEBHOOK_ID, HTTP_CREATED +from homeassistant.const import ATTR_DEVICE_ID, CONF_WEBHOOK_ID, HTTP_CREATED from homeassistant.helpers import config_validation as cv from homeassistant.util import slugify @@ -18,7 +18,6 @@ from .const import ( ATTR_APP_ID, ATTR_APP_NAME, ATTR_APP_VERSION, - ATTR_DEVICE_ID, ATTR_DEVICE_NAME, ATTR_MANUFACTURER, ATTR_MODEL, diff --git a/homeassistant/components/mobile_app/webhook.py b/homeassistant/components/mobile_app/webhook.py index 3044f2df212..a7b3f38a015 100644 --- a/homeassistant/components/mobile_app/webhook.py +++ b/homeassistant/components/mobile_app/webhook.py @@ -23,6 +23,7 @@ from homeassistant.components.frontend import MANIFEST_JSON from homeassistant.components.sensor import DEVICE_CLASSES as SENSOR_CLASSES from homeassistant.components.zone.const import DOMAIN as ZONE_DOMAIN from homeassistant.const import ( + ATTR_DEVICE_ID, ATTR_DOMAIN, ATTR_SERVICE, ATTR_SERVICE_DATA, @@ -49,7 +50,6 @@ from .const import ( ATTR_APP_VERSION, ATTR_CAMERA_ENTITY_ID, ATTR_COURSE, - ATTR_DEVICE_ID, ATTR_DEVICE_NAME, ATTR_EVENT_DATA, ATTR_EVENT_TYPE, diff --git a/homeassistant/components/netatmo/const.py b/homeassistant/components/netatmo/const.py index baee3e4035c..ab268b8703b 100644 --- a/homeassistant/components/netatmo/const.py +++ b/homeassistant/components/netatmo/const.py @@ -72,7 +72,6 @@ DEFAULT_DISCOVERY = True DEFAULT_WEBHOOKS = False ATTR_PSEUDO = "pseudo" -ATTR_NAME = "name" ATTR_EVENT_TYPE = "event_type" ATTR_HEATING_POWER_REQUEST = "heating_power_request" ATTR_HOME_ID = "home_id" diff --git a/homeassistant/components/ombi/__init__.py b/homeassistant/components/ombi/__init__.py index dcd8f264161..5db46658eb1 100644 --- a/homeassistant/components/ombi/__init__.py +++ b/homeassistant/components/ombi/__init__.py @@ -5,6 +5,7 @@ import pyombi import voluptuous as vol from homeassistant.const import ( + ATTR_NAME, CONF_API_KEY, CONF_HOST, CONF_PASSWORD, @@ -15,7 +16,6 @@ from homeassistant.const import ( import homeassistant.helpers.config_validation as cv from .const import ( - ATTR_NAME, ATTR_SEASON, CONF_URLBASE, DEFAULT_PORT, diff --git a/homeassistant/components/ombi/const.py b/homeassistant/components/ombi/const.py index 42b58e7f50d..784b46a99b7 100644 --- a/homeassistant/components/ombi/const.py +++ b/homeassistant/components/ombi/const.py @@ -1,5 +1,4 @@ """Support for Ombi.""" -ATTR_NAME = "name" ATTR_SEASON = "season" CONF_URLBASE = "urlbase" diff --git a/homeassistant/components/prometheus/__init__.py b/homeassistant/components/prometheus/__init__.py index bd9a6e35276..bbab9af83e8 100644 --- a/homeassistant/components/prometheus/__init__.py +++ b/homeassistant/components/prometheus/__init__.py @@ -16,12 +16,12 @@ from homeassistant.components.http import HomeAssistantView from homeassistant.components.humidifier.const import ( ATTR_AVAILABLE_MODES, ATTR_HUMIDITY, - ATTR_MODE, ) from homeassistant.const import ( ATTR_BATTERY_LEVEL, ATTR_DEVICE_CLASS, ATTR_FRIENDLY_NAME, + ATTR_MODE, ATTR_TEMPERATURE, ATTR_UNIT_OF_MEASUREMENT, CONTENT_TYPE_TEXT_PLAIN, diff --git a/homeassistant/components/pushsafer/notify.py b/homeassistant/components/pushsafer/notify.py index 12735764b4b..bec85409010 100644 --- a/homeassistant/components/pushsafer/notify.py +++ b/homeassistant/components/pushsafer/notify.py @@ -15,7 +15,7 @@ from homeassistant.components.notify import ( PLATFORM_SCHEMA, BaseNotificationService, ) -from homeassistant.const import HTTP_OK +from homeassistant.const import ATTR_ICON, HTTP_OK import homeassistant.helpers.config_validation as cv _LOGGER = logging.getLogger(__name__) @@ -28,7 +28,6 @@ CONF_TIMEOUT = 15 # Top level attributes in 'data' ATTR_SOUND = "sound" ATTR_VIBRATION = "vibration" -ATTR_ICON = "icon" ATTR_ICONCOLOR = "iconcolor" ATTR_URL = "url" ATTR_URLTITLE = "urltitle" diff --git a/homeassistant/components/remote/__init__.py b/homeassistant/components/remote/__init__.py index 44a318988b2..b3b84669ed1 100644 --- a/homeassistant/components/remote/__init__.py +++ b/homeassistant/components/remote/__init__.py @@ -8,6 +8,7 @@ import voluptuous as vol from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( + ATTR_COMMAND, SERVICE_TOGGLE, SERVICE_TURN_OFF, SERVICE_TURN_ON, @@ -29,7 +30,6 @@ from homeassistant.loader import bind_hass _LOGGER = logging.getLogger(__name__) ATTR_ACTIVITY = "activity" -ATTR_COMMAND = "command" ATTR_COMMAND_TYPE = "command_type" ATTR_DEVICE = "device" ATTR_NUM_REPEATS = "num_repeats" diff --git a/homeassistant/components/sesame/lock.py b/homeassistant/components/sesame/lock.py index 0ad3d87a171..9c86c262235 100644 --- a/homeassistant/components/sesame/lock.py +++ b/homeassistant/components/sesame/lock.py @@ -7,6 +7,7 @@ import voluptuous as vol from homeassistant.components.lock import PLATFORM_SCHEMA, LockEntity from homeassistant.const import ( ATTR_BATTERY_LEVEL, + ATTR_DEVICE_ID, CONF_API_KEY, STATE_LOCKED, STATE_UNLOCKED, @@ -14,7 +15,6 @@ from homeassistant.const import ( import homeassistant.helpers.config_validation as cv from homeassistant.helpers.typing import ConfigType -ATTR_DEVICE_ID = "device_id" ATTR_SERIAL_NO = "serial" PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({vol.Required(CONF_API_KEY): cv.string}) diff --git a/tests/components/demo/test_humidifier.py b/tests/components/demo/test_humidifier.py index ba2bd60f8f2..cd400f98347 100644 --- a/tests/components/demo/test_humidifier.py +++ b/tests/components/demo/test_humidifier.py @@ -7,7 +7,6 @@ from homeassistant.components.humidifier.const import ( ATTR_HUMIDITY, ATTR_MAX_HUMIDITY, ATTR_MIN_HUMIDITY, - ATTR_MODE, DOMAIN, MODE_AWAY, MODE_ECO, @@ -16,6 +15,7 @@ from homeassistant.components.humidifier.const import ( ) from homeassistant.const import ( ATTR_ENTITY_ID, + ATTR_MODE, SERVICE_TOGGLE, SERVICE_TURN_OFF, SERVICE_TURN_ON, diff --git a/tests/components/google_assistant/test_google_assistant.py b/tests/components/google_assistant/test_google_assistant.py index cd268a5c2d9..bc9195264d9 100644 --- a/tests/components/google_assistant/test_google_assistant.py +++ b/tests/components/google_assistant/test_google_assistant.py @@ -473,4 +473,4 @@ async def test_execute_request(hass_fixture, assistant_client, auth_header): assert dehumidifier.attributes.get(humidifier.ATTR_HUMIDITY) == 45 hygrostat = hass_fixture.states.get("humidifier.hygrostat") - assert hygrostat.attributes.get(humidifier.ATTR_MODE) == "eco" + assert hygrostat.attributes.get(const.ATTR_MODE) == "eco" diff --git a/tests/components/google_assistant/test_trait.py b/tests/components/google_assistant/test_trait.py index ba189020513..43e9c30f91a 100644 --- a/tests/components/google_assistant/test_trait.py +++ b/tests/components/google_assistant/test_trait.py @@ -31,6 +31,7 @@ from homeassistant.const import ( ATTR_ASSUMED_STATE, ATTR_DEVICE_CLASS, ATTR_ENTITY_ID, + ATTR_MODE, ATTR_SUPPORTED_FEATURES, ATTR_TEMPERATURE, SERVICE_TURN_OFF, @@ -1778,7 +1779,7 @@ async def test_modes_humidifier(hass): humidifier.ATTR_MIN_HUMIDITY: 30, humidifier.ATTR_MAX_HUMIDITY: 99, humidifier.ATTR_HUMIDITY: 50, - humidifier.ATTR_MODE: humidifier.MODE_AUTO, + ATTR_MODE: humidifier.MODE_AUTO, }, ), BASIC_CONFIG, diff --git a/tests/components/humidifier/test_device_condition.py b/tests/components/humidifier/test_device_condition.py index d72d0e3b70e..8b356552233 100644 --- a/tests/components/humidifier/test_device_condition.py +++ b/tests/components/humidifier/test_device_condition.py @@ -4,7 +4,7 @@ import voluptuous_serialize import homeassistant.components.automation as automation from homeassistant.components.humidifier import DOMAIN, const, device_condition -from homeassistant.const import STATE_OFF, STATE_ON +from homeassistant.const import ATTR_MODE, STATE_OFF, STATE_ON from homeassistant.helpers import config_validation as cv, device_registry from homeassistant.setup import async_setup_component @@ -51,7 +51,7 @@ async def test_get_conditions(hass, device_reg, entity_reg): f"{DOMAIN}.test_5678", STATE_ON, { - const.ATTR_MODE: const.MODE_AWAY, + ATTR_MODE: const.MODE_AWAY, const.ATTR_AVAILABLE_MODES: [const.MODE_HOME, const.MODE_AWAY], }, ) @@ -98,7 +98,7 @@ async def test_get_conditions_toggle_only(hass, device_reg, entity_reg): f"{DOMAIN}.test_5678", STATE_ON, { - const.ATTR_MODE: const.MODE_AWAY, + ATTR_MODE: const.MODE_AWAY, const.ATTR_AVAILABLE_MODES: [const.MODE_HOME, const.MODE_AWAY], }, ) @@ -127,9 +127,7 @@ async def test_get_conditions_toggle_only(hass, device_reg, entity_reg): async def test_if_state(hass, calls): """Test for turn_on and turn_off conditions.""" - hass.states.async_set( - "humidifier.entity", STATE_ON, {const.ATTR_MODE: const.MODE_AWAY} - ) + hass.states.async_set("humidifier.entity", STATE_ON, {ATTR_MODE: const.MODE_AWAY}) assert await async_setup_component( hass, @@ -213,9 +211,7 @@ async def test_if_state(hass, calls): assert len(calls) == 2 assert calls[1].data["some"] == "is_off event - test_event2" - hass.states.async_set( - "humidifier.entity", STATE_ON, {const.ATTR_MODE: const.MODE_AWAY} - ) + hass.states.async_set("humidifier.entity", STATE_ON, {ATTR_MODE: const.MODE_AWAY}) hass.bus.async_fire("test_event3") await hass.async_block_till_done() @@ -223,9 +219,7 @@ async def test_if_state(hass, calls): assert len(calls) == 3 assert calls[2].data["some"] == "is_mode - event - test_event3" - hass.states.async_set( - "humidifier.entity", STATE_ON, {const.ATTR_MODE: const.MODE_HOME} - ) + hass.states.async_set("humidifier.entity", STATE_ON, {ATTR_MODE: const.MODE_HOME}) # Should not fire hass.bus.async_fire("test_event3") @@ -239,7 +233,7 @@ async def test_capabilities(hass): "humidifier.entity", STATE_ON, { - const.ATTR_MODE: const.MODE_AWAY, + ATTR_MODE: const.MODE_AWAY, const.ATTR_AVAILABLE_MODES: [const.MODE_HOME, const.MODE_AWAY], }, ) diff --git a/tests/components/humidifier/test_device_trigger.py b/tests/components/humidifier/test_device_trigger.py index 0b6154a84df..12918684df7 100644 --- a/tests/components/humidifier/test_device_trigger.py +++ b/tests/components/humidifier/test_device_trigger.py @@ -6,7 +6,7 @@ import voluptuous_serialize import homeassistant.components.automation as automation from homeassistant.components.humidifier import DOMAIN, const, device_trigger -from homeassistant.const import ATTR_SUPPORTED_FEATURES, STATE_OFF, STATE_ON +from homeassistant.const import ATTR_MODE, ATTR_SUPPORTED_FEATURES, STATE_OFF, STATE_ON from homeassistant.helpers import config_validation as cv, device_registry from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util @@ -56,7 +56,7 @@ async def test_get_triggers(hass, device_reg, entity_reg): STATE_ON, { const.ATTR_HUMIDITY: 23, - const.ATTR_MODE: "home", + ATTR_MODE: "home", const.ATTR_AVAILABLE_MODES: ["home", "away"], ATTR_SUPPORTED_FEATURES: 1, }, @@ -95,7 +95,7 @@ async def test_if_fires_on_state_change(hass, calls): STATE_ON, { const.ATTR_HUMIDITY: 23, - const.ATTR_MODE: "home", + ATTR_MODE: "home", const.ATTR_AVAILABLE_MODES: ["home", "away"], ATTR_SUPPORTED_FEATURES: 1, }, @@ -243,7 +243,7 @@ async def test_invalid_config(hass, calls): STATE_ON, { const.ATTR_HUMIDITY: 23, - const.ATTR_MODE: "home", + ATTR_MODE: "home", const.ATTR_AVAILABLE_MODES: ["home", "away"], ATTR_SUPPORTED_FEATURES: 1, }, diff --git a/tests/components/humidifier/test_intent.py b/tests/components/humidifier/test_intent.py index 18c5b632aa6..66ff62872f3 100644 --- a/tests/components/humidifier/test_intent.py +++ b/tests/components/humidifier/test_intent.py @@ -2,7 +2,6 @@ from homeassistant.components.humidifier import ( ATTR_AVAILABLE_MODES, ATTR_HUMIDITY, - ATTR_MODE, DOMAIN, SERVICE_SET_HUMIDITY, SERVICE_SET_MODE, @@ -10,6 +9,7 @@ from homeassistant.components.humidifier import ( ) from homeassistant.const import ( ATTR_ENTITY_ID, + ATTR_MODE, ATTR_SUPPORTED_FEATURES, SERVICE_TURN_ON, STATE_OFF, diff --git a/tests/components/humidifier/test_reproduce_state.py b/tests/components/humidifier/test_reproduce_state.py index 8c1f69353a0..15b797c66a8 100644 --- a/tests/components/humidifier/test_reproduce_state.py +++ b/tests/components/humidifier/test_reproduce_state.py @@ -4,7 +4,6 @@ import pytest from homeassistant.components.humidifier.const import ( ATTR_HUMIDITY, - ATTR_MODE, DOMAIN, MODE_AWAY, MODE_ECO, @@ -13,7 +12,13 @@ from homeassistant.components.humidifier.const import ( SERVICE_SET_MODE, ) from homeassistant.components.humidifier.reproduce_state import async_reproduce_states -from homeassistant.const import SERVICE_TURN_OFF, SERVICE_TURN_ON, STATE_OFF, STATE_ON +from homeassistant.const import ( + ATTR_MODE, + SERVICE_TURN_OFF, + SERVICE_TURN_ON, + STATE_OFF, + STATE_ON, +) from homeassistant.core import Context, State from tests.common import async_mock_service