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.

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

Small huawei_lte improvements #16626

Merged
merged 4 commits into from
Sep 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions homeassistant/components/huawei_lte.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,12 @@ def __getitem__(self, path: str):
such as device_information, device_signal etc, and the remaining
path points to a value in the member's data structure.
"""
cat, *path_ = path.split(".")
return reduce(operator.getitem, path_, getattr(self, cat))
root, *rest = path.split(".")
try:
data = getattr(self, root)
except AttributeError as err:
raise KeyError from err
return reduce(operator.getitem, rest, data)

@Throttle(MIN_TIME_BETWEEN_UPDATES)
def update(self) -> None:
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/sensor/huawei_lte.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class HuaweiLteSensor(Entity):
@property
def unique_id(self) -> str:
"""Return unique ID for sensor."""
return "%s_%s" % (
return "{}_{}".format(
self.path,
self.data["device_information.SerialNumber"],
)
Expand Down
48 changes: 48 additions & 0 deletions tests/components/huawei_lte.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
"""Huawei LTE component tests."""
import pytest

from homeassistant.components import huawei_lte


@pytest.fixture(autouse=True)
def routerdata():
"""Set up a router data for testing."""
rd = huawei_lte.RouterData(None)
rd.device_information = {
'SoftwareVersion': '1.0',
'nested': {'foo': 'bar'},
}
return rd


async def test_routerdata_get_nonexistent_root(routerdata):
"""Test that accessing a nonexistent root element raises KeyError."""
with pytest.raises(KeyError): # NOT AttributeError
routerdata["nonexistent_root.foo"]


async def test_routerdata_get_nonexistent_leaf(routerdata):
"""Test that accessing a nonexistent leaf element raises KeyError."""
with pytest.raises(KeyError):
routerdata["device_information.foo"]


async def test_routerdata_get_nonexistent_leaf_path(routerdata):
"""Test that accessing a nonexistent long path raises KeyError."""
with pytest.raises(KeyError):
routerdata["device_information.long.path.foo"]


async def test_routerdata_get_simple(routerdata):
"""Test that accessing a short, simple path works."""
assert routerdata["device_information.SoftwareVersion"] == "1.0"


async def test_routerdata_get_longer(routerdata):
"""Test that accessing a longer path works."""
assert routerdata["device_information.nested.foo"] == "bar"


async def test_routerdata_get_dict(routerdata):
"""Test that returning an intermediate dict works."""
assert routerdata["device_information.nested"] == {'foo': 'bar'}