Add config flow for Hue (#12830)

* Add config flow for Hue

* Upgrade to aiohue 0.2

* Fix tests

* Add tests

* Add aiohue to test requirements

* Bump aiohue dependency

* Lint

* Lint

* Fix aiohttp mock

* Lint

* Fix tests
This commit is contained in:
Paulus Schoutsen authored and GitHub committed 2018-03-03 21:28:04 -08:00
1 parent d06807c634
commit 67c49a7662
12 files changed
+389 -65

No files matched your search

+1
View File
@@ -0,0 +1 @@
"""Tests for the test utilities."""
+33 -35
View File
@@ -1,11 +1,13 @@
"""Aiohttp test utils."""
import asyncio
from contextlib import contextmanager
import functools
import json as _json
import re
from unittest import mock
from urllib.parse import urlparse, parse_qs
import yarl
from urllib.parse import parse_qs
from aiohttp import ClientSession
from yarl import URL
from aiohttp.client_exceptions import ClientResponseError
@@ -31,14 +33,17 @@ class AiohttpClientMocker:
exc=None,
cookies=None):
"""Mock a request."""
if json:
if json is not None:
text = _json.dumps(json)
if text:
if text is not None:
content = text.encode('utf-8')
if content is None:
content = b''
if not isinstance(url, re._pattern_type):
url = URL(url)
if params:
url = str(yarl.URL(url).with_query(params))
url = url.with_query(params)
self._mocks.append(AiohttpClientMockResponse(
method, url, status, content, cookies, exc, headers))
@@ -74,13 +79,21 @@ class AiohttpClientMocker:
self._cookies.clear()
self.mock_calls.clear()
@asyncio.coroutine
# pylint: disable=unused-variable
def match_request(self, method, url, *, data=None, auth=None, params=None,
headers=None, allow_redirects=None, timeout=None,
json=None):
def create_session(self, loop):
"""Create a ClientSession that is bound to this mocker."""
session = ClientSession(loop=loop)
session._request = self.match_request
return session
async def match_request(self, method, url, *, data=None, auth=None,
params=None, headers=None, allow_redirects=None,
timeout=None, json=None):
"""Match a request against pre-registered requests."""
data = data or json
url = URL(url)
if params:
url = url.with_query(params)
for response in self._mocks:
if response.match_request(method, url, params):
self.mock_calls.append((method, url, data, headers))
@@ -101,8 +114,6 @@ class AiohttpClientMockResponse:
"""Initialize a fake response."""
self.method = method
self._url = url
self._url_parts = (None if hasattr(url, 'search')
else urlparse(url.lower()))
self.status = status
self.response = response
self.exc = exc
@@ -133,25 +144,17 @@ class AiohttpClientMockResponse:
if method.lower() != self.method.lower():
return False
if params:
url = str(yarl.URL(url).with_query(params))
# regular expression matching
if self._url_parts is None:
return self._url.search(url) is not None
if isinstance(self._url, re._pattern_type):
return self._url.search(str(url)) is not None
req = urlparse(url.lower())
if self._url_parts.scheme and req.scheme != self._url_parts.scheme:
return False
if self._url_parts.netloc and req.netloc != self._url_parts.netloc:
return False
if (req.path or '/') != (self._url_parts.path or '/'):
if (self._url.scheme != url.scheme or self._url.host != url.host or
self._url.path != url.path):
return False
# Ensure all query components in matcher are present in the request
request_qs = parse_qs(req.query)
matcher_qs = parse_qs(self._url_parts.query)
request_qs = parse_qs(url.query_string)
matcher_qs = parse_qs(self._url.query_string)
for key, vals in matcher_qs.items():
for val in vals:
try:
@@ -207,12 +210,7 @@ def mock_aiohttp_client():
"""Context manager to mock aiohttp client."""
mocker = AiohttpClientMocker()
with mock.patch('aiohttp.ClientSession') as mock_session:
instance = mock_session()
instance.request = mocker.match_request
for method in ('get', 'post', 'put', 'options', 'delete'):
setattr(instance, method,
functools.partial(mocker.match_request, method))
with mock.patch(
'homeassistant.helpers.aiohttp_client.async_create_clientsession',
side_effect=lambda hass, *args: mocker.create_session(hass.loop)):
yield mocker
+22
View File
@@ -0,0 +1,22 @@
"""Tests for our aiohttp mocker."""
from .aiohttp import AiohttpClientMocker
import pytest
async def test_matching_url():
"""Test we can match urls."""
mocker = AiohttpClientMocker()
mocker.get('http://example.com')
await mocker.match_request('get', 'http://example.com/')
mocker.clear_requests()
with pytest.raises(AssertionError):
await mocker.match_request('get', 'http://example.com/')
mocker.clear_requests()
mocker.get('http://example.com?a=1')
await mocker.match_request('get', 'http://example.com/',
params={'a': 1, 'b': 2})