Centralize all usages of host as a configuration param to the constant CONF_HOST (#22458)
* Centralize all usages of as a configuration param to the constant CONF_HOST * Clean up test
This commit is contained in:
1 parent
9176e13a97
commit
78e162c1d3
16 files changed
+61
-66
No files matched your search
@@ -6,7 +6,8 @@ import pytest
|
||||
|
||||
from homeassistant import data_entry_flow
|
||||
from homeassistant.components.daikin import config_flow
|
||||
from homeassistant.components.daikin.const import KEY_HOST, KEY_IP, KEY_MAC
|
||||
from homeassistant.components.daikin.const import KEY_IP, KEY_MAC
|
||||
from homeassistant.const import CONF_HOST
|
||||
|
||||
from tests.common import MockConfigEntry, MockDependency
|
||||
|
||||
@@ -37,10 +38,10 @@ async def test_user(hass, mock_daikin):
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
|
||||
assert result['step_id'] == 'user'
|
||||
|
||||
result = await flow.async_step_user({KEY_HOST: HOST})
|
||||
result = await flow.async_step_user({CONF_HOST: HOST})
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
|
||||
assert result['title'] == HOST
|
||||
assert result['data'][KEY_HOST] == HOST
|
||||
assert result['data'][CONF_HOST] == HOST
|
||||
assert result['data'][KEY_MAC] == MAC
|
||||
|
||||
|
||||
@@ -49,7 +50,7 @@ async def test_abort_if_already_setup(hass, mock_daikin):
|
||||
flow = init_config_flow(hass)
|
||||
MockConfigEntry(domain='daikin', data={KEY_MAC: MAC}).add_to_hass(hass)
|
||||
|
||||
result = await flow.async_step_user({KEY_HOST: HOST})
|
||||
result = await flow.async_step_user({CONF_HOST: HOST})
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_ABORT
|
||||
assert result['reason'] == 'already_configured'
|
||||
|
||||
@@ -62,10 +63,10 @@ async def test_import(hass, mock_daikin):
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
|
||||
assert result['step_id'] == 'user'
|
||||
|
||||
result = await flow.async_step_import({KEY_HOST: HOST})
|
||||
result = await flow.async_step_import({CONF_HOST: HOST})
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
|
||||
assert result['title'] == HOST
|
||||
assert result['data'][KEY_HOST] == HOST
|
||||
assert result['data'][CONF_HOST] == HOST
|
||||
assert result['data'][KEY_MAC] == MAC
|
||||
|
||||
|
||||
@@ -76,7 +77,7 @@ async def test_discovery(hass, mock_daikin):
|
||||
result = await flow.async_step_discovery({KEY_IP: HOST, KEY_MAC: MAC})
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
|
||||
assert result['title'] == HOST
|
||||
assert result['data'][KEY_HOST] == HOST
|
||||
assert result['data'][CONF_HOST] == HOST
|
||||
assert result['data'][KEY_MAC] == MAC
|
||||
|
||||
|
||||
@@ -88,6 +89,6 @@ async def test_device_abort(hass, mock_daikin, s_effect, reason):
|
||||
flow = init_config_flow(hass)
|
||||
mock_daikin.Appliance.side_effect = s_effect
|
||||
|
||||
result = await flow.async_step_user({KEY_HOST: HOST})
|
||||
result = await flow.async_step_user({CONF_HOST: HOST})
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_ABORT
|
||||
assert result['reason'] == reason
|
||||
@@ -6,20 +6,20 @@ from asynctest import patch, MagicMock
|
||||
|
||||
from homeassistant.components import alarm_control_panel
|
||||
from homeassistant.components.ness_alarm import (
|
||||
DOMAIN, CONF_DEVICE_PORT, CONF_DEVICE_HOST, CONF_ZONE_NAME, CONF_ZONES,
|
||||
DOMAIN, CONF_DEVICE_PORT, CONF_ZONE_NAME, CONF_ZONES,
|
||||
CONF_ZONE_ID, SERVICE_AUX, SERVICE_PANIC,
|
||||
ATTR_CODE, ATTR_OUTPUT_ID)
|
||||
from homeassistant.const import (
|
||||
STATE_ALARM_ARMING, SERVICE_ALARM_DISARM, ATTR_ENTITY_ID,
|
||||
SERVICE_ALARM_ARM_AWAY, SERVICE_ALARM_ARM_HOME, SERVICE_ALARM_TRIGGER,
|
||||
STATE_ALARM_DISARMED, STATE_ALARM_ARMED_AWAY, STATE_ALARM_PENDING,
|
||||
STATE_ALARM_TRIGGERED, STATE_UNKNOWN)
|
||||
STATE_ALARM_TRIGGERED, STATE_UNKNOWN, CONF_HOST)
|
||||
from homeassistant.setup import async_setup_component
|
||||
from tests.common import MockDependency
|
||||
|
||||
VALID_CONFIG = {
|
||||
DOMAIN: {
|
||||
CONF_DEVICE_HOST: 'alarm.local',
|
||||
CONF_HOST: 'alarm.local',
|
||||
CONF_DEVICE_PORT: 1234,
|
||||
CONF_ZONES: [
|
||||
{
|
||||
|
||||
@@ -7,8 +7,9 @@ import pytest
|
||||
|
||||
from homeassistant import data_entry_flow
|
||||
from homeassistant.components.tellduslive import (
|
||||
APPLICATION_NAME, DOMAIN, KEY_HOST, KEY_SCAN_INTERVAL, SCAN_INTERVAL,
|
||||
APPLICATION_NAME, DOMAIN, KEY_SCAN_INTERVAL, SCAN_INTERVAL,
|
||||
config_flow)
|
||||
from homeassistant.const import CONF_HOST
|
||||
|
||||
from tests.common import MockConfigEntry, MockDependency, mock_coro
|
||||
|
||||
@@ -94,7 +95,7 @@ async def test_step_import(hass, mock_tellduslive):
|
||||
flow = init_config_flow(hass)
|
||||
|
||||
result = await flow.async_step_import({
|
||||
KEY_HOST: DOMAIN,
|
||||
CONF_HOST: DOMAIN,
|
||||
KEY_SCAN_INTERVAL: 0,
|
||||
})
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
|
||||
@@ -106,7 +107,7 @@ async def test_step_import_add_host(hass, mock_tellduslive):
|
||||
flow = init_config_flow(hass)
|
||||
|
||||
result = await flow.async_step_import({
|
||||
KEY_HOST: 'localhost',
|
||||
CONF_HOST: 'localhost',
|
||||
KEY_SCAN_INTERVAL: 0,
|
||||
})
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
|
||||
@@ -117,7 +118,7 @@ async def test_step_import_no_config_file(hass, mock_tellduslive):
|
||||
"""Test that we trigger user with no config_file configuring from import."""
|
||||
flow = init_config_flow(hass)
|
||||
|
||||
result = await flow.async_step_import({ KEY_HOST: 'localhost', KEY_SCAN_INTERVAL: 0, })
|
||||
result = await flow.async_step_import({ CONF_HOST: 'localhost', KEY_SCAN_INTERVAL: 0, })
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
|
||||
assert result['step_id'] == 'user'
|
||||
|
||||
@@ -129,7 +130,7 @@ async def test_step_import_load_json_matching_host(hass, mock_tellduslive):
|
||||
with patch('homeassistant.components.tellduslive.config_flow.load_json',
|
||||
return_value={'tellduslive': {}}), \
|
||||
patch('os.path.isfile'):
|
||||
result = await flow.async_step_import({ KEY_HOST: 'Cloud API', KEY_SCAN_INTERVAL: 0, })
|
||||
result = await flow.async_step_import({ CONF_HOST: 'Cloud API', KEY_SCAN_INTERVAL: 0, })
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
|
||||
assert result['step_id'] == 'user'
|
||||
|
||||
@@ -141,7 +142,7 @@ async def test_step_import_load_json(hass, mock_tellduslive):
|
||||
with patch('homeassistant.components.tellduslive.config_flow.load_json',
|
||||
return_value={'localhost': {}}), \
|
||||
patch('os.path.isfile'):
|
||||
result = await flow.async_step_import({ KEY_HOST: 'localhost', KEY_SCAN_INTERVAL: SCAN_INTERVAL, })
|
||||
result = await flow.async_step_import({ CONF_HOST: 'localhost', KEY_SCAN_INTERVAL: SCAN_INTERVAL, })
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
|
||||
assert result['title'] == 'localhost'
|
||||
assert result['data']['host'] == 'localhost'
|
||||
|
||||
Reference in new issue
Block a user