Fix hue accepting filename (#30924)

This commit is contained in:
Paulus Schoutsen 2020-01-17 15:38:38 -08:00 committed by GitHub
parent c9db21ffac
commit 9f20185cee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 10 deletions

View File

@ -36,6 +36,7 @@ BRIDGE_CONFIG_SCHEMA = vol.Schema(
vol.Optional( vol.Optional(
CONF_ALLOW_HUE_GROUPS, default=DEFAULT_ALLOW_HUE_GROUPS CONF_ALLOW_HUE_GROUPS, default=DEFAULT_ALLOW_HUE_GROUPS
): cv.boolean, ): cv.boolean,
vol.Optional("filename"): str,
} }
) )
@ -46,8 +47,10 @@ CONFIG_SCHEMA = vol.Schema(
vol.Optional(CONF_BRIDGES): vol.All( vol.Optional(CONF_BRIDGES): vol.All(
cv.ensure_list, cv.ensure_list,
[ [
cv.deprecated("filename", invalidation_version="0.106.0"), vol.All(
vol.All(BRIDGE_CONFIG_SCHEMA), cv.deprecated("filename", invalidation_version="0.106.0"),
BRIDGE_CONFIG_SCHEMA,
),
], ],
) )
} }

View File

@ -29,12 +29,14 @@ async def test_setup_defined_hosts_known_auth(hass):
hue.DOMAIN, hue.DOMAIN,
{ {
hue.DOMAIN: { hue.DOMAIN: {
hue.CONF_BRIDGES: { hue.CONF_BRIDGES: [
hue.CONF_HOST: "0.0.0.0", {
hue.CONF_ALLOW_HUE_GROUPS: False, hue.CONF_HOST: "0.0.0.0",
hue.CONF_ALLOW_UNREACHABLE: True, hue.CONF_ALLOW_HUE_GROUPS: False,
"filename": "bla", hue.CONF_ALLOW_UNREACHABLE: True,
} },
{hue.CONF_HOST: "1.1.1.1", "filename": "bla"},
]
} }
}, },
) )
@ -42,7 +44,7 @@ async def test_setup_defined_hosts_known_auth(hass):
) )
# Flow started for discovered bridge # Flow started for discovered bridge
assert len(hass.config_entries.flow.async_progress()) == 0 assert len(hass.config_entries.flow.async_progress()) == 1
# Config stored for domain. # Config stored for domain.
assert hass.data[hue.DATA_CONFIGS] == { assert hass.data[hue.DATA_CONFIGS] == {
@ -50,8 +52,13 @@ async def test_setup_defined_hosts_known_auth(hass):
hue.CONF_HOST: "0.0.0.0", hue.CONF_HOST: "0.0.0.0",
hue.CONF_ALLOW_HUE_GROUPS: False, hue.CONF_ALLOW_HUE_GROUPS: False,
hue.CONF_ALLOW_UNREACHABLE: True, hue.CONF_ALLOW_UNREACHABLE: True,
},
"1.1.1.1": {
hue.CONF_HOST: "1.1.1.1",
hue.CONF_ALLOW_HUE_GROUPS: True,
hue.CONF_ALLOW_UNREACHABLE: False,
"filename": "bla", "filename": "bla",
} },
} }