Black
This commit is contained in:
1 parent
da05dfe708
commit
4de97abc3a
2676 files changed
+163166
-140084
No files matched your search
+65
-38
@@ -14,7 +14,7 @@ from aiohttp.client_exceptions import ClientResponseError
|
||||
|
||||
from homeassistant.const import EVENT_HOMEASSISTANT_CLOSE
|
||||
|
||||
retype = type(re.compile(''))
|
||||
retype = type(re.compile(""))
|
||||
|
||||
|
||||
def mock_stream(data):
|
||||
@@ -35,56 +35,64 @@ class AiohttpClientMocker:
|
||||
self._cookies = {}
|
||||
self.mock_calls = []
|
||||
|
||||
def request(self, method, url, *,
|
||||
auth=None,
|
||||
status=200,
|
||||
text=None,
|
||||
data=None,
|
||||
content=None,
|
||||
json=None,
|
||||
params=None,
|
||||
headers={},
|
||||
exc=None,
|
||||
cookies=None):
|
||||
def request(
|
||||
self,
|
||||
method,
|
||||
url,
|
||||
*,
|
||||
auth=None,
|
||||
status=200,
|
||||
text=None,
|
||||
data=None,
|
||||
content=None,
|
||||
json=None,
|
||||
params=None,
|
||||
headers={},
|
||||
exc=None,
|
||||
cookies=None,
|
||||
):
|
||||
"""Mock a request."""
|
||||
if json is not None:
|
||||
text = _json.dumps(json)
|
||||
if text is not None:
|
||||
content = text.encode('utf-8')
|
||||
content = text.encode("utf-8")
|
||||
if content is None:
|
||||
content = b''
|
||||
content = b""
|
||||
|
||||
if not isinstance(url, retype):
|
||||
url = URL(url)
|
||||
if params:
|
||||
url = url.with_query(params)
|
||||
|
||||
self._mocks.append(AiohttpClientMockResponse(
|
||||
method, url, status, content, cookies, exc, headers))
|
||||
self._mocks.append(
|
||||
AiohttpClientMockResponse(
|
||||
method, url, status, content, cookies, exc, headers
|
||||
)
|
||||
)
|
||||
|
||||
def get(self, *args, **kwargs):
|
||||
"""Register a mock get request."""
|
||||
self.request('get', *args, **kwargs)
|
||||
self.request("get", *args, **kwargs)
|
||||
|
||||
def put(self, *args, **kwargs):
|
||||
"""Register a mock put request."""
|
||||
self.request('put', *args, **kwargs)
|
||||
self.request("put", *args, **kwargs)
|
||||
|
||||
def post(self, *args, **kwargs):
|
||||
"""Register a mock post request."""
|
||||
self.request('post', *args, **kwargs)
|
||||
self.request("post", *args, **kwargs)
|
||||
|
||||
def delete(self, *args, **kwargs):
|
||||
"""Register a mock delete request."""
|
||||
self.request('delete', *args, **kwargs)
|
||||
self.request("delete", *args, **kwargs)
|
||||
|
||||
def options(self, *args, **kwargs):
|
||||
"""Register a mock options request."""
|
||||
self.request('options', *args, **kwargs)
|
||||
self.request("options", *args, **kwargs)
|
||||
|
||||
def patch(self, *args, **kwargs):
|
||||
"""Register a mock patch request."""
|
||||
self.request('patch', *args, **kwargs)
|
||||
self.request("patch", *args, **kwargs)
|
||||
|
||||
@property
|
||||
def call_count(self):
|
||||
@@ -101,12 +109,24 @@ class AiohttpClientMocker:
|
||||
"""Create a ClientSession that is bound to this mocker."""
|
||||
session = ClientSession(loop=loop)
|
||||
# Setting directly on `session` will raise deprecation warning
|
||||
object.__setattr__(session, '_request', self.match_request)
|
||||
object.__setattr__(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, cookies=None, **kwargs):
|
||||
async def match_request(
|
||||
self,
|
||||
method,
|
||||
url,
|
||||
*,
|
||||
data=None,
|
||||
auth=None,
|
||||
params=None,
|
||||
headers=None,
|
||||
allow_redirects=None,
|
||||
timeout=None,
|
||||
json=None,
|
||||
cookies=None,
|
||||
**kwargs,
|
||||
):
|
||||
"""Match a request against pre-registered requests."""
|
||||
data = data or json
|
||||
url = URL(url)
|
||||
@@ -121,15 +141,17 @@ class AiohttpClientMocker:
|
||||
raise response.exc
|
||||
return response
|
||||
|
||||
assert False, "No mock registered for {} {} {}".format(method.upper(),
|
||||
url, params)
|
||||
assert False, "No mock registered for {} {} {}".format(
|
||||
method.upper(), url, params
|
||||
)
|
||||
|
||||
|
||||
class AiohttpClientMockResponse:
|
||||
"""Mock Aiohttp client response."""
|
||||
|
||||
def __init__(self, method, url, status, response, cookies=None, exc=None,
|
||||
headers=None):
|
||||
def __init__(
|
||||
self, method, url, status, response, cookies=None, exc=None, headers=None
|
||||
):
|
||||
"""Initialize a fake response."""
|
||||
self.method = method
|
||||
self._url = url
|
||||
@@ -155,8 +177,11 @@ class AiohttpClientMockResponse:
|
||||
if isinstance(self._url, retype):
|
||||
return self._url.search(str(url)) is not None
|
||||
|
||||
if (self._url.scheme != url.scheme or self._url.host != url.host or
|
||||
self._url.path != url.path):
|
||||
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
|
||||
@@ -189,7 +214,7 @@ class AiohttpClientMockResponse:
|
||||
@property
|
||||
def content_type(self):
|
||||
"""Return yarl of URL."""
|
||||
return self._headers.get('content-type')
|
||||
return self._headers.get("content-type")
|
||||
|
||||
@property
|
||||
def content(self):
|
||||
@@ -202,12 +227,12 @@ class AiohttpClientMockResponse:
|
||||
return self.response
|
||||
|
||||
@asyncio.coroutine
|
||||
def text(self, encoding='utf-8'):
|
||||
def text(self, encoding="utf-8"):
|
||||
"""Return mock response as a string."""
|
||||
return self.response.decode(encoding)
|
||||
|
||||
@asyncio.coroutine
|
||||
def json(self, encoding='utf-8'):
|
||||
def json(self, encoding="utf-8"):
|
||||
"""Return mock response as a json."""
|
||||
return _json.loads(self.response.decode(encoding))
|
||||
|
||||
@@ -220,7 +245,8 @@ class AiohttpClientMockResponse:
|
||||
"""Raise error if status is 400 or higher."""
|
||||
if self.status >= 400:
|
||||
raise ClientResponseError(
|
||||
None, None, code=self.status, headers=self.headers)
|
||||
None, None, code=self.status, headers=self.headers
|
||||
)
|
||||
|
||||
def close(self):
|
||||
"""Mock close."""
|
||||
@@ -244,6 +270,7 @@ def mock_aiohttp_client():
|
||||
return session
|
||||
|
||||
with mock.patch(
|
||||
'homeassistant.helpers.aiohttp_client.async_create_clientsession',
|
||||
side_effect=create_session):
|
||||
"homeassistant.helpers.aiohttp_client.async_create_clientsession",
|
||||
side_effect=create_session,
|
||||
):
|
||||
yield mocker
|
||||
@@ -7,16 +7,15 @@ 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.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/')
|
||||
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})
|
||||
mocker.get("http://example.com?a=1")
|
||||
await mocker.match_request("get", "http://example.com/", params={"a": 1, "b": 2})
|
||||
Reference in new issue
Block a user