mirror of
https://github.com/home-assistant/core.git
synced 2025-04-23 08:47:57 +00:00
Fix voluptuous breaking change things (#12611)
* Fix voluptuous breaking change things * Change xiaomi aqara back
This commit is contained in:
parent
6ee3c1b3e5
commit
1e672b93e7
@ -35,7 +35,7 @@ DEPENDENCIES = ['knx']
|
||||
AUTOMATION_SCHEMA = vol.Schema({
|
||||
vol.Optional(CONF_HOOK, default=CONF_DEFAULT_HOOK): cv.string,
|
||||
vol.Optional(CONF_COUNTER, default=CONF_DEFAULT_COUNTER): cv.port,
|
||||
vol.Required(CONF_ACTION, default=None): cv.SCRIPT_SCHEMA
|
||||
vol.Required(CONF_ACTION): cv.SCRIPT_SCHEMA
|
||||
})
|
||||
|
||||
AUTOMATIONS_SCHEMA = vol.All(
|
||||
|
@ -42,7 +42,7 @@ TV_NO_INFO = 'No info: TV resumed after pause'
|
||||
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
|
||||
vol.Required(CONF_HOST): cv.string,
|
||||
vol.Required(CONF_PSK): cv.string,
|
||||
vol.Optional(CONF_MAC, default=None): cv.string,
|
||||
vol.Optional(CONF_MAC): cv.string,
|
||||
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
|
||||
vol.Optional(CONF_AMP, default=False): cv.boolean,
|
||||
vol.Optional(CONF_ANDROID, default=True): cv.boolean,
|
||||
|
@ -524,18 +524,14 @@ def test_enum():
|
||||
|
||||
def test_socket_timeout(): # pylint: disable=invalid-name
|
||||
"""Test socket timeout validator."""
|
||||
TEST_CONF_TIMEOUT = 'timeout' # pylint: disable=invalid-name
|
||||
|
||||
schema = vol.Schema(
|
||||
{vol.Required(TEST_CONF_TIMEOUT, default=None): cv.socket_timeout})
|
||||
schema = vol.Schema(cv.socket_timeout)
|
||||
|
||||
with pytest.raises(vol.Invalid):
|
||||
schema({TEST_CONF_TIMEOUT: 0.0})
|
||||
schema(0.0)
|
||||
|
||||
with pytest.raises(vol.Invalid):
|
||||
schema({TEST_CONF_TIMEOUT: -1})
|
||||
schema(-1)
|
||||
|
||||
assert _GLOBAL_DEFAULT_TIMEOUT == schema({TEST_CONF_TIMEOUT:
|
||||
None})[TEST_CONF_TIMEOUT]
|
||||
assert _GLOBAL_DEFAULT_TIMEOUT == schema(None)
|
||||
|
||||
assert schema({TEST_CONF_TIMEOUT: 1})[TEST_CONF_TIMEOUT] == 1.0
|
||||
assert schema(1) == 1.0
|
||||
|
Loading…
x
Reference in New Issue
Block a user