Unittests for ddwrt device tracker and bugfix (#3996)

* BUG Message data cannot be changed thus use voluptuous to ensure format

* Pilight daemon expects JSON serializable data

Thus dict is needed and not a mapping proxy.

* Add explanation why dict as message data is needed

* Use more obvious voluptuous validation scheme

* Pylint:  Trailing whitespace

* Pilight sensor component

* Python 3.4 compatibility

* D202

* Use pytest-caplog and no unittest.TestCase

* Fix setup/teardown of unittests

* Activate coverage testing

* Bugfix whitelist filter and use bugfixed pilight library

* Use newest pilight library that has a bugfix

* Add unittest for pilight hub component

* PEP257 for docstrings

* Bugfix setting device name from host name and small cleanup

- Init with connection error handling is more clear
- Comments clean-up

* PEP257

* New unittest with full coverage

* Upload missing testfixtures

* D209

* Handle double quotes in reply

* Formatting
This commit is contained in:
David-Leon Pohl authored and Paulus Schoutsen committed 2016-10-24 22:18:24 -07:00
1 parent 2604dd89a6
commit e2d23d902a
5 files changed
+290 -20

No files matched your search

@@ -35,9 +35,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
# pylint: disable=unused-argument
def get_scanner(hass, config):
"""Validate the configuration and return a DD-WRT scanner."""
scanner = DdWrtDeviceScanner(config[DOMAIN])
return scanner if scanner.success_init else None
try:
return DdWrtDeviceScanner(config[DOMAIN])
except ConnectionError:
return None
# pylint: disable=too-many-instance-attributes
@@ -53,13 +54,13 @@ class DdWrtDeviceScanner(object):
self.lock = threading.Lock()
self.last_results = {}
self.mac2name = {}
# Test the router is accessible
url = 'http://{}/Status_Wireless.live.asp'.format(self.host)
data = self.get_ddwrt_data(url)
self.success_init = data is not None
if not data:
raise ConnectionError('Cannot connect to DD-Wrt router')
def scan_devices(self):
"""Scan for new devices and return a list with found device IDs."""
@@ -83,14 +84,15 @@ class DdWrtDeviceScanner(object):
if not dhcp_leases:
return None
# Remove leading and trailing single quotes.
cleaned_str = dhcp_leases.strip().strip('"')
elements = cleaned_str.split('","')
num_clients = int(len(elements)/5)
# Remove leading and trailing quotes and spaces
cleaned_str = dhcp_leases.replace(
"\"", "").replace("\'", "").replace(" ", "")
elements = cleaned_str.split(',')
num_clients = int(len(elements) / 5)
self.mac2name = {}
for idx in range(0, num_clients):
# This is stupid but the data is a single array
# every 5 elements represents one hosts, the MAC
# The data is a single array
# every 5 elements represents one host, the MAC
# is the third element and the name is the first.
mac_index = (idx * 5) + 2
if mac_index < len(elements):
@@ -105,9 +107,6 @@ class DdWrtDeviceScanner(object):
Return boolean if scanning successful.
"""
if not self.success_init:
return False
with self.lock:
_LOGGER.info('Checking ARP')
@@ -123,11 +122,8 @@ class DdWrtDeviceScanner(object):
if not active_clients:
return False
# This is really lame, instead of using JSON the DD-WRT UI
# uses its own data format for some reason and then
# regex's out values so I guess I have to do the same,
# LAME!!!
# The DD-WRT UI uses its own data format and then
# regex's out values so this is done here too
# Remove leading and trailing single quotes.
clean_str = active_clients.strip().strip("'")
elements = clean_str.split("','")