evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use dataclass properties in tolo discovery (#60784)

Browse source
This commit is contained in:
epenet 2021-12-01 20:43:33 +01:00 • committed by GitHub
parent 7a098cff1c
commit 1fa0351447
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
homeassistant/components/tolo/config_flow.py
View file

@ -10,7 +10,6 @@ from tololib.errors import ResponseTimedOutError
import voluptuous as vol
from homeassistant.components import dhcp
from homeassistant.components.dhcp import IP_ADDRESS, MAC_ADDRESS
from homeassistant.config_entries import ConfigFlow
from homeassistant.const import CONF_HOST
from homeassistant.data_entry_flow import FlowResult
@ -67,16 +66,16 @@ class ToloSaunaConfigFlow(ConfigFlow, domain=DOMAIN):
async def async_step_dhcp(self, discovery_info: dhcp.DhcpServiceInfo) -> FlowResult:
"""Handle a flow initialized by discovery."""
await self.async_set_unique_id(format_mac(discovery_info[MAC_ADDRESS]))
self._abort_if_unique_id_configured({CONF_HOST: discovery_info[IP_ADDRESS]})
self._async_abort_entries_match({CONF_HOST: discovery_info[IP_ADDRESS]})
await self.async_set_unique_id(format_mac(discovery_info.macaddress))
self._abort_if_unique_id_configured({CONF_HOST: discovery_info.ip})
self._async_abort_entries_match({CONF_HOST: discovery_info.ip})
device_available = await self.hass.async_add_executor_job(
self._check_device_availability, discovery_info[IP_ADDRESS]
self._check_device_availability, discovery_info.ip
)
if device_available:
self._discovered_host = discovery_info[IP_ADDRESS]
self._discovered_host = discovery_info.ip
return await self.async_step_confirm()
return self.async_abort(reason="not_tolo_device")

6
tests/components/tolo/test_config_flow.py
View file

@ -4,7 +4,7 @@ from unittest.mock import Mock, patch
import pytest
from tololib.errors import ResponseTimedOutError
from homeassistant.components.dhcp import IP_ADDRESS, MAC_ADDRESS
from homeassistant.components import dhcp
from homeassistant.components.tolo.const import DOMAIN
from homeassistant.config_entries import SOURCE_DHCP, SOURCE_USER
from homeassistant.const import CONF_HOST
@ -15,7 +15,9 @@ from homeassistant.data_entry_flow import (
RESULT_TYPE_FORM,
)
MOCK_DHCP_DATA = {IP_ADDRESS: "127.0.0.2", MAC_ADDRESS: "00:11:22:33:44:55"}
MOCK_DHCP_DATA = dhcp.DhcpServiceInfo(
ip="127.0.0.2", macaddress="00:11:22:33:44:55", hostname="mock_hostname"
)
@pytest.fixture(name="toloclient")