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

Bump Daikin version, catch new exception during config_flow (#57080)

Browse source
This commit is contained in:
Fredrik Erlandsson 2021-10-11 13:11:02 +02:00 • committed by GitHub
parent 1fbc94f56d
commit cadbf7f6a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
homeassistant/components/daikin/config_flow.py
View file

@ -5,7 +5,7 @@ from uuid import uuid4
from aiohttp import ClientError, web_exceptions from aiohttp import ClientError, web_exceptions
from async_timeout import timeout from async_timeout import timeout
from pydaikin.daikin_base import Appliance from pydaikin.daikin_base import Appliance, DaikinException
from pydaikin.discovery import Discovery from pydaikin.discovery import Discovery
import voluptuous as vol import voluptuous as vol
@ -88,6 +88,13 @@ class FlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
data_schema=self.schema, data_schema=self.schema,
errors={"base": "invalid_auth"}, errors={"base": "invalid_auth"},
) )
except DaikinException as daikin_exp:
_LOGGER.error(daikin_exp)
return self.async_show_form(
step_id="user",
data_schema=self.schema,
errors={"base": "unknown"},
)
except Exception: # pylint: disable=broad-except except Exception: # pylint: disable=broad-except
_LOGGER.exception("Unexpected error creating device") _LOGGER.exception("Unexpected error creating device")
return self.async_show_form( return self.async_show_form(

2
homeassistant/components/daikin/manifest.json
View file

@ -3,7 +3,7 @@
"name": "Daikin AC", "name": "Daikin AC",
"config_flow": true, "config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/daikin", "documentation": "https://www.home-assistant.io/integrations/daikin",
"requirements": ["pydaikin==2.4.4"], "requirements": ["pydaikin==2.6.0"],
"codeowners": ["@fredrike"], "codeowners": ["@fredrike"],
"zeroconf": ["_dkapi._tcp.local."], "zeroconf": ["_dkapi._tcp.local."],
"quality_scale": "platinum", "quality_scale": "platinum",

2
requirements_all.txt
View file

@ -1414,7 +1414,7 @@ pycsspeechtts==1.0.4
# pycups==1.9.73 # pycups==1.9.73
# homeassistant.components.daikin # homeassistant.components.daikin
pydaikin==2.4.4 pydaikin==2.6.0
# homeassistant.components.danfoss_air # homeassistant.components.danfoss_air
pydanfossair==0.1.0 pydanfossair==0.1.0

2
requirements_test_all.txt
View file

@ -829,7 +829,7 @@ pycomfoconnect==0.4
pycoolmasternet-async==0.1.2 pycoolmasternet-async==0.1.2
# homeassistant.components.daikin # homeassistant.components.daikin
pydaikin==2.4.4 pydaikin==2.6.0
# homeassistant.components.deconz # homeassistant.components.deconz
pydeconz==84 pydeconz==84

2
tests/components/daikin/test_config_flow.py
View file

@ -4,6 +4,7 @@ import asyncio
from unittest.mock import PropertyMock, patch from unittest.mock import PropertyMock, patch
from aiohttp import ClientError, web_exceptions from aiohttp import ClientError, web_exceptions
from pydaikin.exceptions import DaikinException
import pytest import pytest
from homeassistant.components.daikin.const import KEY_MAC from homeassistant.components.daikin.const import KEY_MAC
@ -85,6 +86,7 @@ async def test_abort_if_already_setup(hass, mock_daikin):
(asyncio.TimeoutError, "cannot_connect"), (asyncio.TimeoutError, "cannot_connect"),
(ClientError, "cannot_connect"), (ClientError, "cannot_connect"),
(web_exceptions.HTTPForbidden, "invalid_auth"), (web_exceptions.HTTPForbidden, "invalid_auth"),
(DaikinException, "unknown"),
(Exception, "unknown"), (Exception, "unknown"),
], ],
) )