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

Use common strings in opentherm_gw config flow (#42211)

Browse source 
* Use common strings in opentherm_gw config flow

* Combine TimeourError and SerialException handling

* Fixed test_form_connection_error

* And then fix the flake8 error...

* Change "timeout" to "cannot_connect" msg
This commit is contained in:
wouterbaake 2020-10-25 22:01:05 +01:00 • committed by GitHub
parent de12ac354a
commit e6400fc11b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
homeassistant/components/opentherm_gw/config_flow.py
View file

@ -58,10 +58,8 @@ class OpenThermGwConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
try:
res = await asyncio.wait_for(test_connection(), timeout=10)
except asyncio.TimeoutError:
return self._show_form({"base": "timeout"})
except SerialException:
return self._show_form({"base": "serial_error"})
except (asyncio.TimeoutError, SerialException):
return self._show_form({"base": "cannot_connect"})
if res:
return self._create_entry(gw_id, name, device)

5
homeassistant/components/opentherm_gw/strings.json
View file

@ -11,10 +11,9 @@
}
},
"error": {
"already_configured": "Gateway already configured",
"already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
"id_exists": "Gateway id already exists",
"serial_error": "Error connecting to device",
"timeout": "Connection attempt timed out"
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
}
},
"options": {

4
tests/components/opentherm_gw/test_config_flow.py
View file

@ -148,7 +148,7 @@ async def test_form_connection_timeout(hass):
)
assert result2["type"] == "form"
assert result2["errors"] == {"base": "timeout"}
assert result2["errors"] == {"base": "cannot_connect"}
assert len(mock_connect.mock_calls) == 1
@ -164,7 +164,7 @@ async def test_form_connection_error(hass):
)
assert result2["type"] == "form"
assert result2["errors"] == {"base": "serial_error"}
assert result2["errors"] == {"base": "cannot_connect"}
assert len(mock_connect.mock_calls) == 1