Skip to content

Update axis to use common strings #41164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartinHjelmare merged 3 commits into from
Oct 6, 2020
Merged

Update axis to use common strings #41164

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e5c325
Update axis to use common strings
davet2001 Oct 3, 2020
e6436ca
Update common str device_unavailable to cannot_connect
davet2001 Oct 5, 2020
6a58c5a
Merge branch 'dev' into axis_use_common_strings
Kane610 Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions homeassistant/components/axis/config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ async def async_step_user(self, user_input=None):
return await self._create_entry()

except AuthenticationRequired:
errors["base"] = "faulty_credentials"
errors["base"] = "invalid_auth"

except CannotConnect:
errors["base"] = "device_unavailable"
errors["base"] = "cannot_connect"

data = self.discovery_schema or {
vol.Required(CONF_HOST): str,
Expand Down
8 changes: 4 additions & 4 deletions homeassistant/components/axis/strings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
}
},
"error": {
"already_configured": "Device is already configured",
"already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
"already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
"device_unavailable": "Device is not available",
"faulty_credentials": "Bad user credentials"
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
"invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
},
"abort": {
"already_configured": "Device is already configured",
"already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
"bad_config_file": "Bad data from configuration file",
"link_local_address": "Link local addresses are not supported",
"not_axis_device": "Discovered device not an Axis device"
Expand Down
8 changes: 4 additions & 4 deletions tests/components/axis/test_config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ async def test_flow_fails_faulty_credentials(hass):
},
)

assert result["errors"] == {"base": "faulty_credentials"}
assert result["errors"] == {"base": "invalid_auth"}


async def test_flow_fails_device_unavailable(hass):
"""Test that config flow fails on device unavailable."""
async def test_flow_fails_cannot_connect(hass):
"""Test that config flow fails on cannot connect."""
result = await hass.config_entries.flow.async_init(
AXIS_DOMAIN, context={"source": "user"}
)
Expand All @@ -165,7 +165,7 @@ async def test_flow_fails_device_unavailable(hass):
},
)

assert result["errors"] == {"base": "device_unavailable"}
assert result["errors"] == {"base": "cannot_connect"}


async def test_flow_create_entry_multiple_existing_entries_of_same_model(hass):
Expand Down