jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-25 22:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup Withings const import (#100914)

Browse Source
This commit is contained in:
Joost Lekkerkerker 2023-09-26 13:16:37 +02:00 committed by GitHub
parent bd7a86a0a6
commit 4ffac3e7ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homeassistant/components/withings/__init__.py
View File

@ -34,18 +34,16 @@ from homeassistant.helpers import config_entry_oauth2_flow, config_validation as
from homeassistant.helpers.event import async_call_later from homeassistant.helpers.event import async_call_later
from homeassistant.helpers.typing import ConfigType from homeassistant.helpers.typing import ConfigType
from . import const
from .api import ConfigEntryWithingsApi from .api import ConfigEntryWithingsApi
from .const import CONF_USE_WEBHOOK, CONFIG, LOGGER from .const import CONF_PROFILES, CONF_USE_WEBHOOK, CONFIG, DOMAIN, LOGGER
from .coordinator import WithingsDataUpdateCoordinator from .coordinator import WithingsDataUpdateCoordinator
DOMAIN = const.DOMAIN
PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR] PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]
CONFIG_SCHEMA = vol.Schema( CONFIG_SCHEMA = vol.Schema(
{ {
DOMAIN: vol.All( DOMAIN: vol.All(
cv.deprecated(const.CONF_PROFILES), cv.deprecated(CONF_PROFILES),
cv.deprecated(CONF_CLIENT_ID), cv.deprecated(CONF_CLIENT_ID),
cv.deprecated(CONF_CLIENT_SECRET), cv.deprecated(CONF_CLIENT_SECRET),
vol.Schema( vol.Schema(
@ -54,8 +52,8 @@ CONFIG_SCHEMA = vol.Schema(
vol.Optional(CONF_CLIENT_SECRET): vol.All( vol.Optional(CONF_CLIENT_SECRET): vol.All(
cv.string, vol.Length(min=1) cv.string, vol.Length(min=1)
), ),
vol.Optional(const.CONF_USE_WEBHOOK): cv.boolean, vol.Optional(CONF_USE_WEBHOOK): cv.boolean,
vol.Optional(const.CONF_PROFILES): vol.All( vol.Optional(CONF_PROFILES): vol.All(
cv.ensure_list, cv.ensure_list,
vol.Unique(), vol.Unique(),
vol.Length(min=1), vol.Length(min=1),
@ -74,10 +72,10 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
if not (conf := config.get(DOMAIN)): if not (conf := config.get(DOMAIN)):
# Apply the defaults. # Apply the defaults.
conf = CONFIG_SCHEMA({DOMAIN: {}})[DOMAIN] conf = CONFIG_SCHEMA({DOMAIN: {}})[DOMAIN]
hass.data[DOMAIN] = {const.CONFIG: conf} hass.data[DOMAIN] = {CONFIG: conf}
return True return True
hass.data[DOMAIN] = {const.CONFIG: conf} hass.data[DOMAIN] = {CONFIG: conf}
# Setup the oauth2 config flow. # Setup the oauth2 config flow.
if CONF_CLIENT_ID in conf: if CONF_CLIENT_ID in conf:

17
tests/components/withings/test_init.py
View File

@ -11,7 +11,8 @@ from withings_api.common import AuthFailedException, NotifyAppli, UnauthorizedEx
from homeassistant import config_entries from homeassistant import config_entries
from homeassistant.components.webhook import async_generate_url from homeassistant.components.webhook import async_generate_url
from homeassistant.components.withings import CONFIG_SCHEMA, DOMAIN, async_setup, const from homeassistant.components.withings import CONFIG_SCHEMA, async_setup
from homeassistant.components.withings.const import CONF_USE_WEBHOOK, DOMAIN
from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET, CONF_WEBHOOK_ID from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET, CONF_WEBHOOK_ID
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.util import dt as dt_util from homeassistant.util import dt as dt_util
@ -25,7 +26,7 @@ from tests.typing import ClientSessionGenerator
def config_schema_validate(withings_config) -> dict: def config_schema_validate(withings_config) -> dict:
"""Assert a schema config succeeds.""" """Assert a schema config succeeds."""
hass_config = {const.DOMAIN: withings_config} hass_config = {DOMAIN: withings_config}
return CONFIG_SCHEMA(hass_config) return CONFIG_SCHEMA(hass_config)
@ -42,7 +43,7 @@ def test_config_schema_basic_config() -> None:
{ {
CONF_CLIENT_ID: "my_client_id", CONF_CLIENT_ID: "my_client_id",
CONF_CLIENT_SECRET: "my_client_secret", CONF_CLIENT_SECRET: "my_client_secret",
const.CONF_USE_WEBHOOK: True, CONF_USE_WEBHOOK: True,
} }
) )
@ -74,23 +75,23 @@ def test_config_schema_use_webhook() -> None:
{ {
CONF_CLIENT_ID: "my_client_id", CONF_CLIENT_ID: "my_client_id",
CONF_CLIENT_SECRET: "my_client_secret", CONF_CLIENT_SECRET: "my_client_secret",
const.CONF_USE_WEBHOOK: True, CONF_USE_WEBHOOK: True,
} }
) )
assert config[const.DOMAIN][const.CONF_USE_WEBHOOK] is True assert config[DOMAIN][CONF_USE_WEBHOOK] is True
config = config_schema_validate( config = config_schema_validate(
{ {
CONF_CLIENT_ID: "my_client_id", CONF_CLIENT_ID: "my_client_id",
CONF_CLIENT_SECRET: "my_client_secret", CONF_CLIENT_SECRET: "my_client_secret",
const.CONF_USE_WEBHOOK: False, CONF_USE_WEBHOOK: False,
} }
) )
assert config[const.DOMAIN][const.CONF_USE_WEBHOOK] is False assert config[DOMAIN][CONF_USE_WEBHOOK] is False
config_schema_assert_fail( config_schema_assert_fail(
{ {
CONF_CLIENT_ID: "my_client_id", CONF_CLIENT_ID: "my_client_id",
CONF_CLIENT_SECRET: "my_client_secret", CONF_CLIENT_SECRET: "my_client_secret",
const.CONF_USE_WEBHOOK: "A", CONF_USE_WEBHOOK: "A",
} }
) )