jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-27 07:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve ipp unique id parsing (#35959)

Browse Source
This commit is contained in:
Chris Talkington 2020-05-23 13:02:49 -05:00 committed by GitHub
parent 6e3bba07da
commit be854b7363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
homeassistant/components/ipp/config_flow.py
View File

@ -85,12 +85,12 @@ class IPPFlowHandler(ConfigFlow, domain=DOMAIN):
unique_id = user_input[CONF_UUID] = info[CONF_UUID] unique_id = user_input[CONF_UUID] = info[CONF_UUID]
if unique_id is None and info[CONF_SERIAL] is not None: if not unique_id and info[CONF_SERIAL]:
_LOGGER.debug( _LOGGER.debug(
"Printer UUID is missing from IPP response. Falling back to IPP serial number" "Printer UUID is missing from IPP response. Falling back to IPP serial number"
) )
unique_id = info[CONF_SERIAL] unique_id = info[CONF_SERIAL]
elif unique_id is None: elif not unique_id:
_LOGGER.debug("Unable to determine unique id from IPP response") _LOGGER.debug("Unable to determine unique id from IPP response")
await self.async_set_unique_id(unique_id) await self.async_set_unique_id(unique_id)
@ -138,17 +138,17 @@ class IPPFlowHandler(ConfigFlow, domain=DOMAIN):
return self.async_abort(reason="ipp_error") return self.async_abort(reason="ipp_error")
unique_id = self.discovery_info[CONF_UUID] unique_id = self.discovery_info[CONF_UUID]
if unique_id is None and info[CONF_UUID] is not None: if not unique_id and info[CONF_UUID]:
_LOGGER.debug( _LOGGER.debug(
"Printer UUID is missing from discovery info. Falling back to IPP UUID" "Printer UUID is missing from discovery info. Falling back to IPP UUID"
) )
unique_id = self.discovery_info[CONF_UUID] = info[CONF_UUID] unique_id = self.discovery_info[CONF_UUID] = info[CONF_UUID]
elif unique_id is None and info[CONF_SERIAL] is not None: elif not unique_id and info[CONF_SERIAL]:
_LOGGER.debug( _LOGGER.debug(
"Printer UUID is missing from discovery info and IPP response. Falling back to IPP serial number" "Printer UUID is missing from discovery info and IPP response. Falling back to IPP serial number"
) )
unique_id = info[CONF_SERIAL] unique_id = info[CONF_SERIAL]
elif unique_id is None: elif not unique_id:
_LOGGER.debug( _LOGGER.debug(
"Unable to determine unique id from discovery info and IPP response" "Unable to determine unique id from discovery info and IPP response"
) )

18
tests/components/ipp/test_config_flow.py
View File

@ -264,6 +264,24 @@ async def test_zeroconf_with_uuid_device_exists_abort(
assert result["reason"] == "already_configured" assert result["reason"] == "already_configured"
async def test_zeroconf_empty_unique_id_required_abort(
hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
) -> None:
"""Test we abort zeroconf flow if printer lacks (empty) unique identification."""
mock_connection(aioclient_mock, no_unique_id=True)
discovery_info = {
**MOCK_ZEROCONF_IPP_SERVICE_INFO,
"properties": {**MOCK_ZEROCONF_IPP_SERVICE_INFO["properties"], "UUID": ""},
}
result = await hass.config_entries.flow.async_init(
DOMAIN, context={"source": SOURCE_ZEROCONF}, data=discovery_info,
)
assert result["type"] == RESULT_TYPE_ABORT
assert result["reason"] == "unique_id_required"
async def test_zeroconf_unique_id_required_abort( async def test_zeroconf_unique_id_required_abort(
hass: HomeAssistant, aioclient_mock: AiohttpClientMocker hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
) -> None: ) -> None: