jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-29 03:37:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address post-merge coolmaster config flow code review (#28163)

Browse Source 
* Address post-merge code review comments

* Use component path for 3rd party lib
This commit is contained in:
On Freund 2019-10-25 19:39:16 +03:00 committed by Martin Hjelmare
parent 43c7b57d1e
commit 0656f0c62b
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
homeassistant/components/coolmaster/__init__.py
View File

@ -8,15 +8,13 @@ async def async_setup(hass, config):
async def async_setup_entry(hass, entry): async def async_setup_entry(hass, entry):
"""Set up Coolmaster from a config entry.""" """Set up Coolmaster from a config entry."""
hass.async_add_job(hass.config_entries.async_forward_entry_setup(entry, "climate")) hass.async_create_task(
hass.config_entries.async_forward_entry_setup(entry, "climate")
)
return True return True
async def async_unload_entry(hass, entry): async def async_unload_entry(hass, entry):
"""Unload a Coolmaster config entry.""" """Unload a Coolmaster config entry."""
await hass.async_add_job( return await hass.config_entries.async_forward_entry_unload(entry, "climate")
hass.config_entries.async_forward_entry_unload(entry, "climate")
)
return True

7
homeassistant/components/coolmaster/config_flow.py
View File

@ -14,11 +14,10 @@ MODES_SCHEMA = {vol.Required(mode, default=True): bool for mode in AVAILABLE_MOD
DATA_SCHEMA = vol.Schema({vol.Required(CONF_HOST): str, **MODES_SCHEMA}) DATA_SCHEMA = vol.Schema({vol.Required(CONF_HOST): str, **MODES_SCHEMA})
async def validate_connection(hass: core.HomeAssistant, host): async def _validate_connection(hass: core.HomeAssistant, host):
"""Validate that we can connect to the Coolmaster instance."""
cool = CoolMasterNet(host, port=DEFAULT_PORT) cool = CoolMasterNet(host, port=DEFAULT_PORT)
devices = await hass.async_add_executor_job(cool.devices) devices = await hass.async_add_executor_job(cool.devices)
return len(devices) > 0 return bool(devices)
class CoolmasterConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): class CoolmasterConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
@ -50,7 +49,7 @@ class CoolmasterConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
host = user_input[CONF_HOST] host = user_input[CONF_HOST]
try: try:
result = await validate_connection(self.hass, host) result = await _validate_connection(self.hass, host)
if not result: if not result:
errors["base"] = "no_units" errors["base"] = "no_units"
except (ConnectionRefusedError, TimeoutError): except (ConnectionRefusedError, TimeoutError):

14
tests/components/coolmaster/test_config_flow.py
View File

@ -4,8 +4,6 @@ from unittest.mock import patch
from homeassistant import config_entries, setup from homeassistant import config_entries, setup
from homeassistant.components.coolmaster.const import DOMAIN, AVAILABLE_MODES from homeassistant.components.coolmaster.const import DOMAIN, AVAILABLE_MODES
# from homeassistant.components.coolmaster.config_flow import validate_connection
from tests.common import mock_coro from tests.common import mock_coro
@ -26,8 +24,8 @@ async def test_form(hass):
assert result["errors"] is None assert result["errors"] is None
with patch( with patch(
"homeassistant.components.coolmaster.config_flow.validate_connection", "homeassistant.components.coolmaster.config_flow.CoolMasterNet.devices",
return_value=mock_coro(True), return_value=[1],
), patch( ), patch(
"homeassistant.components.coolmaster.async_setup", return_value=mock_coro(True) "homeassistant.components.coolmaster.async_setup", return_value=mock_coro(True)
) as mock_setup, patch( ) as mock_setup, patch(
@ -57,7 +55,7 @@ async def test_form_timeout(hass):
) )
with patch( with patch(
"homeassistant.components.coolmaster.config_flow.validate_connection", "homeassistant.components.coolmaster.config_flow.CoolMasterNet.devices",
side_effect=TimeoutError(), side_effect=TimeoutError(),
): ):
result2 = await hass.config_entries.flow.async_configure( result2 = await hass.config_entries.flow.async_configure(
@ -75,7 +73,7 @@ async def test_form_connection_refused(hass):
) )
with patch( with patch(
"homeassistant.components.coolmaster.config_flow.validate_connection", "homeassistant.components.coolmaster.config_flow.CoolMasterNet.devices",
side_effect=ConnectionRefusedError(), side_effect=ConnectionRefusedError(),
): ):
result2 = await hass.config_entries.flow.async_configure( result2 = await hass.config_entries.flow.async_configure(
@ -93,8 +91,8 @@ async def test_form_no_units(hass):
) )
with patch( with patch(
"homeassistant.components.coolmaster.config_flow.validate_connection", "homeassistant.components.coolmaster.config_flow.CoolMasterNet.devices",
return_value=mock_coro(False), return_value=[],
): ):
result2 = await hass.config_entries.flow.async_configure( result2 = await hass.config_entries.flow.async_configure(
result["flow_id"], _flow_data() result["flow_id"], _flow_data()