Use HOMEASSISTANT_DOMAIN alias for core DOMAIN in tests (#122762)

This commit is contained in:
epenet 2024-07-29 12:51:12 +02:00 committed by GitHub
parent e5bb1b2cc6
commit 075550b7ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 71 additions and 41 deletions

View file

@ -32,7 +32,11 @@ from homeassistant.const import (
CONF_PACKAGES,
__version__,
)
from homeassistant.core import DOMAIN as HA_DOMAIN, ConfigSource, HomeAssistant
from homeassistant.core import (
DOMAIN as HOMEASSISTANT_DOMAIN,
ConfigSource,
HomeAssistant,
)
from homeassistant.exceptions import ConfigValidationError, HomeAssistantError
from homeassistant.helpers import (
check_config,
@ -1066,7 +1070,9 @@ async def test_check_ha_config_file_wrong(mock_check, hass: HomeAssistant) -> No
"hass_config",
[
{
HA_DOMAIN: {CONF_PACKAGES: {"pack_dict": {"input_boolean": {"ib1": None}}}},
HOMEASSISTANT_DOMAIN: {
CONF_PACKAGES: {"pack_dict": {"input_boolean": {"ib1": None}}}
},
"input_boolean": {"ib2": None},
"light": {"platform": "test"},
}
@ -1080,7 +1086,7 @@ async def test_async_hass_config_yaml_merge(
conf = await config_util.async_hass_config_yaml(hass)
assert merge_log_err.call_count == 0
assert conf[HA_DOMAIN].get(CONF_PACKAGES) is not None
assert conf[HOMEASSISTANT_DOMAIN].get(CONF_PACKAGES) is not None
assert len(conf) == 3
assert len(conf["input_boolean"]) == 2
assert len(conf["light"]) == 1
@ -1108,7 +1114,7 @@ async def test_merge(merge_log_err: MagicMock, hass: HomeAssistant) -> None:
},
}
config = {
HA_DOMAIN: {CONF_PACKAGES: packages},
HOMEASSISTANT_DOMAIN: {CONF_PACKAGES: packages},
"input_boolean": {"ib2": None},
"light": {"platform": "test"},
"automation": [],
@ -1135,7 +1141,7 @@ async def test_merge_try_falsy(merge_log_err: MagicMock, hass: HomeAssistant) ->
"pack_list2": {"light": OrderedDict()},
}
config = {
HA_DOMAIN: {CONF_PACKAGES: packages},
HOMEASSISTANT_DOMAIN: {CONF_PACKAGES: packages},
"automation": {"do": "something"},
"light": {"some": "light"},
}
@ -1158,7 +1164,7 @@ async def test_merge_new(merge_log_err: MagicMock, hass: HomeAssistant) -> None:
"api": {},
},
}
config = {HA_DOMAIN: {CONF_PACKAGES: packages}}
config = {HOMEASSISTANT_DOMAIN: {CONF_PACKAGES: packages}}
await config_util.merge_packages_config(hass, config, packages)
assert merge_log_err.call_count == 0
@ -1178,7 +1184,7 @@ async def test_merge_type_mismatch(
"pack_2": {"light": {"ib1": None}}, # light gets merged - ensure_list
}
config = {
HA_DOMAIN: {CONF_PACKAGES: packages},
HOMEASSISTANT_DOMAIN: {CONF_PACKAGES: packages},
"input_boolean": {"ib2": None},
"input_select": [{"ib2": None}],
"light": [{"platform": "two"}],
@ -1196,13 +1202,13 @@ async def test_merge_once_only_keys(
) -> None:
"""Test if we have a merge for a comp that may occur only once. Keys."""
packages = {"pack_2": {"api": None}}
config = {HA_DOMAIN: {CONF_PACKAGES: packages}, "api": None}
config = {HOMEASSISTANT_DOMAIN: {CONF_PACKAGES: packages}, "api": None}
await config_util.merge_packages_config(hass, config, packages)
assert config["api"] == OrderedDict()
packages = {"pack_2": {"api": {"key_3": 3}}}
config = {
HA_DOMAIN: {CONF_PACKAGES: packages},
HOMEASSISTANT_DOMAIN: {CONF_PACKAGES: packages},
"api": {"key_1": 1, "key_2": 2},
}
await config_util.merge_packages_config(hass, config, packages)
@ -1211,7 +1217,7 @@ async def test_merge_once_only_keys(
# Duplicate keys error
packages = {"pack_2": {"api": {"key": 2}}}
config = {
HA_DOMAIN: {CONF_PACKAGES: packages},
HOMEASSISTANT_DOMAIN: {CONF_PACKAGES: packages},
"api": {"key": 1},
}
await config_util.merge_packages_config(hass, config, packages)
@ -1226,7 +1232,7 @@ async def test_merge_once_only_lists(hass: HomeAssistant) -> None:
}
}
config = {
HA_DOMAIN: {CONF_PACKAGES: packages},
HOMEASSISTANT_DOMAIN: {CONF_PACKAGES: packages},
"api": {"list_1": ["item_1"]},
}
await config_util.merge_packages_config(hass, config, packages)
@ -1249,7 +1255,7 @@ async def test_merge_once_only_dictionaries(hass: HomeAssistant) -> None:
}
}
config = {
HA_DOMAIN: {CONF_PACKAGES: packages},
HOMEASSISTANT_DOMAIN: {CONF_PACKAGES: packages},
"api": {"dict_1": {"key_1": 1, "dict_1.1": {"key_1.1": 1.1}}},
}
await config_util.merge_packages_config(hass, config, packages)
@ -1285,7 +1291,7 @@ async def test_merge_duplicate_keys(
"""Test if keys in dicts are duplicates."""
packages = {"pack_1": {"input_select": {"ib1": None}}}
config = {
HA_DOMAIN: {CONF_PACKAGES: packages},
HOMEASSISTANT_DOMAIN: {CONF_PACKAGES: packages},
"input_select": {"ib1": 1},
}
await config_util.merge_packages_config(hass, config, packages)
@ -1443,7 +1449,7 @@ async def test_merge_split_component_definition(hass: HomeAssistant) -> None:
"pack_1": {"light one": {"l1": None}},
"pack_2": {"light two": {"l2": None}, "light three": {"l3": None}},
}
config = {HA_DOMAIN: {CONF_PACKAGES: packages}}
config = {HOMEASSISTANT_DOMAIN: {CONF_PACKAGES: packages}}
await config_util.merge_packages_config(hass, config, packages)
assert len(config) == 4
@ -2332,7 +2338,7 @@ async def test_packages_schema_validation_error(
]
assert error_records == snapshot
assert len(config[HA_DOMAIN][CONF_PACKAGES]) == 0
assert len(config[HOMEASSISTANT_DOMAIN][CONF_PACKAGES]) == 0
def test_extract_domain_configs() -> None: