Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use common strings for Panasonic Viera #41268

Merged
merged 12 commits into from Oct 6, 2020
Merged

Use common strings for Panasonic Viera #41268

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4249681
Update strings.json
TopdRob Oct 5, 2020
32c33cb
Update config_flow.py
TopdRob Oct 5, 2020
607117a
Update homeassistant/components/panasonic_viera/strings.json
TopdRob Oct 5, 2020
4238f7e
Update homeassistant/components/panasonic_viera/strings.json
TopdRob Oct 5, 2020
8d99c10
Update config_flow.py
TopdRob Oct 5, 2020
c2a6b01
Update test_config_flow.py
TopdRob Oct 5, 2020
d42c804
Update test_config_flow.py
TopdRob Oct 5, 2020
1cddf5a
Fix failed tests
TopdRob Oct 5, 2020
f61c618
revert line 530
TopdRob Oct 5, 2020
0af0c8f
Fix remaining error key
MartinHjelmare Oct 5, 2020
b65ed3a
Remove not needed import
MartinHjelmare Oct 5, 2020
29fae28
Update const.py
TopdRob Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 5 additions & 7 deletions homeassistant/components/panasonic_viera/config_flow.py
View file
Open in desktop
Expand Up @@ -18,8 +18,6 @@
DOMAIN,
ERROR_INVALID_PIN_CODE,
ERROR_NOT_CONNECTED,
MartinHjelmare marked this conversation as resolved.
Show resolved Hide resolved
REASON_NOT_CONNECTED,
REASON_UNKNOWN,
)

_LOGGER = logging.getLogger(__name__)
Expand Down Expand Up @@ -57,7 +55,7 @@ async def async_step_user(self, user_input=None):
errors["base"] = ERROR_NOT_CONNECTED
MartinHjelmare marked this conversation as resolved.
Show resolved Hide resolved
except Exception as err: # pylint: disable=broad-except
_LOGGER.exception("An unknown error occurred: %s", err)
return self.async_abort(reason=REASON_UNKNOWN)
return self.async_abort(reason="unknown")

if "base" not in errors:
if self._remote.type == TV_TYPE_ENCRYPTED:
Expand Down Expand Up @@ -104,10 +102,10 @@ async def async_step_pairing(self, user_input=None):
errors["base"] = ERROR_INVALID_PIN_CODE
except (TimeoutError, URLError, OSError) as err:
_LOGGER.error("The remote connection was lost: %s", err)
return self.async_abort(reason=REASON_NOT_CONNECTED)
return self.async_abort(reason="cannot_connect")
except Exception as err: # pylint: disable=broad-except
_LOGGER.exception("Unknown error: %s", err)
return self.async_abort(reason=REASON_UNKNOWN)
return self.async_abort(reason="unknown")

if "base" not in errors:
encryption_data = {
Expand All @@ -128,10 +126,10 @@ async def async_step_pairing(self, user_input=None):
)
except (TimeoutError, URLError, SOAPError, OSError) as err:
_LOGGER.error("The remote connection was lost: %s", err)
return self.async_abort(reason=REASON_NOT_CONNECTED)
return self.async_abort(reason="cannot_connect")
except Exception as err: # pylint: disable=broad-except
_LOGGER.exception("Unknown error: %s", err)
return self.async_abort(reason=REASON_UNKNOWN)
return self.async_abort(reason="unknown")

return self.async_show_form(
step_id="pairing",
Expand Down
8 changes: 4 additions & 4 deletions homeassistant/components/panasonic_viera/strings.json
View file
Open in desktop
Expand Up @@ -19,13 +19,13 @@
}
},
"error": {
"not_connected": "Could not establish a remote connection with your Panasonic Viera TV",
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
"invalid_pin_code": "The PIN code you entered was invalid"
},
"abort": {
"already_configured": "This Panasonic Viera TV is already configured.",
"not_connected": "The remote connection with your Panasonic Viera TV was lost. Check the logs for more information.",
"unknown": "An unknown error occured. Check the logs for more information."
"already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
"unknown": "[%key:common::config_flow::error::unknown%]"
}
}
}
19 changes: 8 additions & 11 deletions tests/components/panasonic_viera/test_config_flow.py
View file
Open in desktop
Expand Up @@ -11,9 +11,6 @@
DEFAULT_PORT,
DOMAIN,
ERROR_INVALID_PIN_CODE,
ERROR_NOT_CONNECTED,
REASON_NOT_CONNECTED,
REASON_UNKNOWN,
)
from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PIN, CONF_PORT

Expand Down Expand Up @@ -116,7 +113,7 @@ async def test_flow_not_connected_error(hass):

assert result["type"] == "form"
assert result["step_id"] == "user"
assert result["errors"] == {"base": ERROR_NOT_CONNECTED}
assert result["errors"] == "cannot_connect"
MartinHjelmare marked this conversation as resolved.
Show resolved Hide resolved


async def test_flow_unknown_abort(hass):
Expand All @@ -139,7 +136,7 @@ async def test_flow_unknown_abort(hass):
)

assert result["type"] == "abort"
assert result["reason"] == REASON_UNKNOWN
assert result["reason"] == "unknown"


async def test_flow_encrypted_valid_pin_code(hass):
Expand Down Expand Up @@ -255,7 +252,7 @@ async def test_flow_encrypted_not_connected_abort(hass):
)

assert result["type"] == "abort"
assert result["reason"] == REASON_NOT_CONNECTED
assert result["reason"] == "cannot_connect"


async def test_flow_encrypted_unknown_abort(hass):
Expand Down Expand Up @@ -288,7 +285,7 @@ async def test_flow_encrypted_unknown_abort(hass):
)

assert result["type"] == "abort"
assert result["reason"] == REASON_UNKNOWN
assert result["reason"] == "unknown"


async def test_flow_non_encrypted_already_configured_abort(hass):
Expand Down Expand Up @@ -475,7 +472,7 @@ async def test_imported_flow_encrypted_not_connected_abort(hass):
)

assert result["type"] == "abort"
assert result["reason"] == REASON_NOT_CONNECTED
assert result["reason"] == "cannot_connect"


async def test_imported_flow_encrypted_unknown_abort(hass):
Expand Down Expand Up @@ -507,7 +504,7 @@ async def test_imported_flow_encrypted_unknown_abort(hass):
)

assert result["type"] == "abort"
assert result["reason"] == REASON_UNKNOWN
assert result["reason"] == "unknown"


async def test_imported_flow_not_connected_error(hass):
Expand All @@ -530,7 +527,7 @@ async def test_imported_flow_not_connected_error(hass):

assert result["type"] == "form"
assert result["step_id"] == "user"
assert result["errors"] == {"base": ERROR_NOT_CONNECTED}
assert result["errors"] == {"base": "cannot_connect"}


async def test_imported_flow_unknown_abort(hass):
Expand All @@ -552,7 +549,7 @@ async def test_imported_flow_unknown_abort(hass):
)

assert result["type"] == "abort"
assert result["reason"] == REASON_UNKNOWN
assert result["reason"] == "unknown"


async def test_imported_flow_non_encrypted_already_configured_abort(hass):
Expand Down