diff --git a/homeassistant/components/ring.py b/homeassistant/components/ring.py
index 6e70ddb244de94b8f711daa57b5bd1cdcfd1a282..1a15e22fca08c12460f19f9655ab54c4cf9299b3 100644
--- a/homeassistant/components/ring.py
+++ b/homeassistant/components/ring.py
@@ -37,8 +37,8 @@ CONFIG_SCHEMA = vol.Schema({
def setup(hass, config):
"""Set up the Ring component."""
conf = config[DOMAIN]
- username = conf.get(CONF_USERNAME)
- password = conf.get(CONF_PASSWORD)
+ username = conf[CONF_USERNAME]
+ password = conf[CONF_PASSWORD]
try:
from ring_doorbell import Ring
diff --git a/homeassistant/helpers/aiohttp_client.py b/homeassistant/helpers/aiohttp_client.py
index 72f2214b5e786c64f13dcfad37fb704049b2dd92..bb34942ad795dd78f2def3a1f6001eb0fcc7f130 100644
--- a/homeassistant/helpers/aiohttp_client.py
+++ b/homeassistant/helpers/aiohttp_client.py
@@ -149,34 +149,27 @@ def _async_get_connector(hass, verify_ssl=True):
This method must be run in the event loop.
"""
- is_new = False
+ key = DATA_CONNECTOR if verify_ssl else DATA_CONNECTOR_NOTVERIFY
+
+ if key in hass.data:
+ return hass.data[key]
if verify_ssl:
- if DATA_CONNECTOR not in hass.data:
- ssl_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
- ssl_context.load_verify_locations(cafile=certifi.where(),
- capath=None)
- connector = aiohttp.TCPConnector(loop=hass.loop,
- ssl_context=ssl_context)
- hass.data[DATA_CONNECTOR] = connector
- is_new = True
- else:
- connector = hass.data[DATA_CONNECTOR]
+ ssl_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+ ssl_context.load_verify_locations(cafile=certifi.where(),
+ capath=None)
else:
- if DATA_CONNECTOR_NOTVERIFY not in hass.data:
- connector = aiohttp.TCPConnector(loop=hass.loop, verify_ssl=False)
- hass.data[DATA_CONNECTOR_NOTVERIFY] = connector
- is_new = True
- else:
- connector = hass.data[DATA_CONNECTOR_NOTVERIFY]
-
- if is_new:
- @callback
- def _async_close_connector(event):
- """Close connector pool."""
- connector.close()
-
- hass.bus.async_listen_once(
- EVENT_HOMEASSISTANT_CLOSE, _async_close_connector)
+ ssl_context = False
+
+ connector = aiohttp.TCPConnector(loop=hass.loop, ssl=ssl_context)
+ hass.data[key] = connector
+
+ @callback
+ def _async_close_connector(event):
+ """Close connector pool."""
+ connector.close()
+
+ hass.bus.async_listen_once(
+ EVENT_HOMEASSISTANT_CLOSE, _async_close_connector)
return connector
diff --git a/tests/components/alexa/test_flash_briefings.py b/tests/components/alexa/test_flash_briefings.py
index d9f0c8e156ddf10b5914a876b7cf2b8f0c6b8c2c..d7871e82afc58c02ddf9d51dff64ee2ed63954b5 100644
--- a/tests/components/alexa/test_flash_briefings.py
+++ b/tests/components/alexa/test_flash_briefings.py
@@ -21,7 +21,7 @@ NPR_NEWS_MP3_URL = "https://pd.npr.org/anon.npr-mp3/npr/news/newscast.mp3"
@pytest.fixture
-def alexa_client(loop, hass, test_client):
+def alexa_client(loop, hass, aiohttp_client):
"""Initialize a Home Assistant server for testing this module."""
@callback
def mock_service(call):
@@ -49,7 +49,7 @@ def alexa_client(loop, hass, test_client):
},
}
}))
- return loop.run_until_complete(test_client(hass.http.app))
+ return loop.run_until_complete(aiohttp_client(hass.http.app))
def _flash_briefing_req(client, briefing_id):
diff --git a/tests/components/alexa/test_intent.py b/tests/components/alexa/test_intent.py
index 2c8fafde15544f54665229679414a03a66972e91..d15c7ccbb34edab749e20c5a95cad63e7f0fa485 100644
--- a/tests/components/alexa/test_intent.py
+++ b/tests/components/alexa/test_intent.py
@@ -23,7 +23,7 @@ NPR_NEWS_MP3_URL = "https://pd.npr.org/anon.npr-mp3/npr/news/newscast.mp3"
@pytest.fixture
-def alexa_client(loop, hass, test_client):
+def alexa_client(loop, hass, aiohttp_client):
"""Initialize a Home Assistant server for testing this module."""
@callback
def mock_service(call):
@@ -95,7 +95,7 @@ def alexa_client(loop, hass, test_client):
},
}
}))
- return loop.run_until_complete(test_client(hass.http.app))
+ return loop.run_until_complete(aiohttp_client(hass.http.app))
def _intent_req(client, data=None):
diff --git a/tests/components/alexa/test_smart_home.py b/tests/components/alexa/test_smart_home.py
index 8de4d0d9affaa984832fdb675c3653b5bcbb6434..a5375ba2662219b944cb14f701d3f3281c6e9a21 100644
--- a/tests/components/alexa/test_smart_home.py
+++ b/tests/components/alexa/test_smart_home.py
@@ -1199,10 +1199,10 @@ def test_unsupported_domain(hass):
@asyncio.coroutine
-def do_http_discovery(config, hass, test_client):
+def do_http_discovery(config, hass, aiohttp_client):
"""Submit a request to the Smart Home HTTP API."""
yield from async_setup_component(hass, alexa.DOMAIN, config)
- http_client = yield from test_client(hass.http.app)
+ http_client = yield from aiohttp_client(hass.http.app)
request = get_new_request('Alexa.Discovery', 'Discover')
response = yield from http_client.post(
@@ -1213,7 +1213,7 @@ def do_http_discovery(config, hass, test_client):
@asyncio.coroutine
-def test_http_api(hass, test_client):
+def test_http_api(hass, aiohttp_client):
"""With `smart_home:` HTTP API is exposed."""
config = {
'alexa': {
@@ -1221,7 +1221,7 @@ def test_http_api(hass, test_client):
}
}
- response = yield from do_http_discovery(config, hass, test_client)
+ response = yield from do_http_discovery(config, hass, aiohttp_client)
response_data = yield from response.json()
# Here we're testing just the HTTP view glue -- details of discovery are
@@ -1230,12 +1230,12 @@ def test_http_api(hass, test_client):
@asyncio.coroutine
-def test_http_api_disabled(hass, test_client):
+def test_http_api_disabled(hass, aiohttp_client):
"""Without `smart_home:`, the HTTP API is disabled."""
config = {
'alexa': {}
}
- response = yield from do_http_discovery(config, hass, test_client)
+ response = yield from do_http_discovery(config, hass, aiohttp_client)
assert response.status == 404
diff --git a/tests/components/camera/test_generic.py b/tests/components/camera/test_generic.py
index 84eaf107d706e50798dc72698675d718995ca33a..01edca1e996a27860a1f75eb608587f1b3751f8d 100644
--- a/tests/components/camera/test_generic.py
+++ b/tests/components/camera/test_generic.py
@@ -6,7 +6,7 @@ from homeassistant.setup import async_setup_component
@asyncio.coroutine
-def test_fetching_url(aioclient_mock, hass, test_client):
+def test_fetching_url(aioclient_mock, hass, aiohttp_client):
"""Test that it fetches the given url."""
aioclient_mock.get('http://example.com', text='hello world')
@@ -19,7 +19,7 @@ def test_fetching_url(aioclient_mock, hass, test_client):
'password': 'pass'
}})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.get('/api/camera_proxy/camera.config_test')
@@ -33,7 +33,7 @@ def test_fetching_url(aioclient_mock, hass, test_client):
@asyncio.coroutine
-def test_limit_refetch(aioclient_mock, hass, test_client):
+def test_limit_refetch(aioclient_mock, hass, aiohttp_client):
"""Test that it fetches the given url."""
aioclient_mock.get('http://example.com/5a', text='hello world')
aioclient_mock.get('http://example.com/10a', text='hello world')
@@ -49,7 +49,7 @@ def test_limit_refetch(aioclient_mock, hass, test_client):
'limit_refetch_to_url_change': True,
}})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.get('/api/camera_proxy/camera.config_test')
@@ -94,7 +94,7 @@ def test_limit_refetch(aioclient_mock, hass, test_client):
@asyncio.coroutine
-def test_camera_content_type(aioclient_mock, hass, test_client):
+def test_camera_content_type(aioclient_mock, hass, aiohttp_client):
"""Test generic camera with custom content_type."""
svg_image = '<some image>'
urlsvg = 'https://upload.wikimedia.org/wikipedia/commons/0/02/SVG_logo.svg'
@@ -113,7 +113,7 @@ def test_camera_content_type(aioclient_mock, hass, test_client):
yield from async_setup_component(hass, 'camera', {
'camera': [cam_config_svg, cam_config_normal]})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp_1 = yield from client.get('/api/camera_proxy/camera.config_test_svg')
assert aioclient_mock.call_count == 1
diff --git a/tests/components/camera/test_local_file.py b/tests/components/camera/test_local_file.py
index 42ce7bd7add04a4b30be5cfd79f3d985c8df3254..1098c8c923313ae88a9c3a57a0151b0dfb7f4951 100644
--- a/tests/components/camera/test_local_file.py
+++ b/tests/components/camera/test_local_file.py
@@ -12,7 +12,7 @@ from tests.common import mock_registry
@asyncio.coroutine
-def test_loading_file(hass, test_client):
+def test_loading_file(hass, aiohttp_client):
"""Test that it loads image from disk."""
mock_registry(hass)
@@ -25,7 +25,7 @@ def test_loading_file(hass, test_client):
'file_path': 'mock.file',
}})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
m_open = MockOpen(read_data=b'hello')
with mock.patch(
@@ -57,7 +57,7 @@ def test_file_not_readable(hass, caplog):
@asyncio.coroutine
-def test_camera_content_type(hass, test_client):
+def test_camera_content_type(hass, aiohttp_client):
"""Test local_file camera content_type."""
cam_config_jpg = {
'name': 'test_jpg',
@@ -84,7 +84,7 @@ def test_camera_content_type(hass, test_client):
'camera': [cam_config_jpg, cam_config_png,
cam_config_svg, cam_config_noext]})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
image = 'hello'
m_open = MockOpen(read_data=image.encode())
diff --git a/tests/components/camera/test_mqtt.py b/tests/components/camera/test_mqtt.py
index 20d15efd982449fb31c1387b32776f46c951db1a..d83054d7732622850775b0a182c46233b6b34160 100644
--- a/tests/components/camera/test_mqtt.py
+++ b/tests/components/camera/test_mqtt.py
@@ -8,7 +8,7 @@ from tests.common import (
@asyncio.coroutine
-def test_run_camera_setup(hass, test_client):
+def test_run_camera_setup(hass, aiohttp_client):
"""Test that it fetches the given payload."""
topic = 'test/camera'
yield from async_mock_mqtt_component(hass)
@@ -24,7 +24,7 @@ def test_run_camera_setup(hass, test_client):
async_fire_mqtt_message(hass, topic, 'beer')
yield from hass.async_block_till_done()
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.get(url)
assert resp.status == 200
body = yield from resp.text()
diff --git a/tests/components/cloud/test_http_api.py b/tests/components/cloud/test_http_api.py
index 98ddebb5db36924a7e0decc71dad257e3d75248d..1ed3d1b4744801e46df0ccf8e228705f63f8d42b 100644
--- a/tests/components/cloud/test_http_api.py
+++ b/tests/components/cloud/test_http_api.py
@@ -12,7 +12,7 @@ from tests.common import mock_coro
@pytest.fixture
-def cloud_client(hass, test_client):
+def cloud_client(hass, aiohttp_client):
"""Fixture that can fetch from the cloud client."""
with patch('homeassistant.components.cloud.Cloud.async_start',
return_value=mock_coro()):
@@ -28,7 +28,7 @@ def cloud_client(hass, test_client):
hass.data['cloud']._decode_claims = \
lambda token: jwt.get_unverified_claims(token)
with patch('homeassistant.components.cloud.Cloud.write_user_info'):
- yield hass.loop.run_until_complete(test_client(hass.http.app))
+ yield hass.loop.run_until_complete(aiohttp_client(hass.http.app))
@pytest.fixture
diff --git a/tests/components/config/test_config_entries.py b/tests/components/config/test_config_entries.py
index 84667b8704b7b00575c28583f1bf83ed7a879d88..cfe6b12baac5e28fff4eb9833fc3e07ba6f9ff30 100644
--- a/tests/components/config/test_config_entries.py
+++ b/tests/components/config/test_config_entries.py
@@ -17,11 +17,11 @@ from tests.common import MockConfigEntry, MockModule, mock_coro_func
@pytest.fixture
-def client(hass, test_client):
+def client(hass, aiohttp_client):
"""Fixture that can interact with the config manager API."""
hass.loop.run_until_complete(async_setup_component(hass, 'http', {}))
hass.loop.run_until_complete(config_entries.async_setup(hass))
- yield hass.loop.run_until_complete(test_client(hass.http.app))
+ yield hass.loop.run_until_complete(aiohttp_client(hass.http.app))
@asyncio.coroutine
diff --git a/tests/components/config/test_core.py b/tests/components/config/test_core.py
index 4d82d695f8bdf2e301677355be1470433c052514..5b52b3d571111c081b0bf53e038ce59be0e58ca3 100644
--- a/tests/components/config/test_core.py
+++ b/tests/components/config/test_core.py
@@ -8,14 +8,14 @@ from tests.common import mock_coro
@asyncio.coroutine
-def test_validate_config_ok(hass, test_client):
+def test_validate_config_ok(hass, aiohttp_client):
"""Test checking config."""
with patch.object(config, 'SECTIONS', ['core']):
yield from async_setup_component(hass, 'config', {})
yield from asyncio.sleep(0.1, loop=hass.loop)
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
with patch(
'homeassistant.components.config.core.async_check_ha_config_file',
diff --git a/tests/components/config/test_customize.py b/tests/components/config/test_customize.py
index f12774c25d9510779b2195d4daca585170527b7a..100a18618e69dc75eb6f6708d613cf9d786005e9 100644
--- a/tests/components/config/test_customize.py
+++ b/tests/components/config/test_customize.py
@@ -9,12 +9,12 @@ from homeassistant.config import DATA_CUSTOMIZE
@asyncio.coroutine
-def test_get_entity(hass, test_client):
+def test_get_entity(hass, aiohttp_client):
"""Test getting entity."""
with patch.object(config, 'SECTIONS', ['customize']):
yield from async_setup_component(hass, 'config', {})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
def mock_read(path):
"""Mock reading data."""
@@ -38,12 +38,12 @@ def test_get_entity(hass, test_client):
@asyncio.coroutine
-def test_update_entity(hass, test_client):
+def test_update_entity(hass, aiohttp_client):
"""Test updating entity."""
with patch.object(config, 'SECTIONS', ['customize']):
yield from async_setup_component(hass, 'config', {})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
orig_data = {
'hello.beer': {
@@ -89,12 +89,12 @@ def test_update_entity(hass, test_client):
@asyncio.coroutine
-def test_update_entity_invalid_key(hass, test_client):
+def test_update_entity_invalid_key(hass, aiohttp_client):
"""Test updating entity."""
with patch.object(config, 'SECTIONS', ['customize']):
yield from async_setup_component(hass, 'config', {})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.post(
'/api/config/customize/config/not_entity', data=json.dumps({
@@ -105,12 +105,12 @@ def test_update_entity_invalid_key(hass, test_client):
@asyncio.coroutine
-def test_update_entity_invalid_json(hass, test_client):
+def test_update_entity_invalid_json(hass, aiohttp_client):
"""Test updating entity."""
with patch.object(config, 'SECTIONS', ['customize']):
yield from async_setup_component(hass, 'config', {})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.post(
'/api/config/customize/config/hello.beer', data='not json')
diff --git a/tests/components/config/test_entity_registry.py b/tests/components/config/test_entity_registry.py
index aa7a5ce5f0e2b4399809f847427edeff95754890..fd7c69994776d893159341f7c3d427785fb6e83a 100644
--- a/tests/components/config/test_entity_registry.py
+++ b/tests/components/config/test_entity_registry.py
@@ -8,11 +8,11 @@ from tests.common import mock_registry, MockEntity, MockEntityPlatform
@pytest.fixture
-def client(hass, test_client):
+def client(hass, aiohttp_client):
"""Fixture that can interact with the config manager API."""
hass.loop.run_until_complete(async_setup_component(hass, 'http', {}))
hass.loop.run_until_complete(entity_registry.async_setup(hass))
- yield hass.loop.run_until_complete(test_client(hass.http.app))
+ yield hass.loop.run_until_complete(aiohttp_client(hass.http.app))
async def test_get_entity(hass, client):
diff --git a/tests/components/config/test_group.py b/tests/components/config/test_group.py
index ad28b6eb9b8417fe58c4500d3f40e89ca84634f0..06ba2ff1105014e1038b9f7a3efb7987e1afb976 100644
--- a/tests/components/config/test_group.py
+++ b/tests/components/config/test_group.py
@@ -11,12 +11,12 @@ VIEW_NAME = 'api:config:group:config'
@asyncio.coroutine
-def test_get_device_config(hass, test_client):
+def test_get_device_config(hass, aiohttp_client):
"""Test getting device config."""
with patch.object(config, 'SECTIONS', ['group']):
yield from async_setup_component(hass, 'config', {})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
def mock_read(path):
"""Mock reading data."""
@@ -40,12 +40,12 @@ def test_get_device_config(hass, test_client):
@asyncio.coroutine
-def test_update_device_config(hass, test_client):
+def test_update_device_config(hass, aiohttp_client):
"""Test updating device config."""
with patch.object(config, 'SECTIONS', ['group']):
yield from async_setup_component(hass, 'config', {})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
orig_data = {
'hello.beer': {
@@ -89,12 +89,12 @@ def test_update_device_config(hass, test_client):
@asyncio.coroutine
-def test_update_device_config_invalid_key(hass, test_client):
+def test_update_device_config_invalid_key(hass, aiohttp_client):
"""Test updating device config."""
with patch.object(config, 'SECTIONS', ['group']):
yield from async_setup_component(hass, 'config', {})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.post(
'/api/config/group/config/not a slug', data=json.dumps({
@@ -105,12 +105,12 @@ def test_update_device_config_invalid_key(hass, test_client):
@asyncio.coroutine
-def test_update_device_config_invalid_data(hass, test_client):
+def test_update_device_config_invalid_data(hass, aiohttp_client):
"""Test updating device config."""
with patch.object(config, 'SECTIONS', ['group']):
yield from async_setup_component(hass, 'config', {})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.post(
'/api/config/group/config/hello_beer', data=json.dumps({
@@ -121,12 +121,12 @@ def test_update_device_config_invalid_data(hass, test_client):
@asyncio.coroutine
-def test_update_device_config_invalid_json(hass, test_client):
+def test_update_device_config_invalid_json(hass, aiohttp_client):
"""Test updating device config."""
with patch.object(config, 'SECTIONS', ['group']):
yield from async_setup_component(hass, 'config', {})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.post(
'/api/config/group/config/hello_beer', data='not json')
diff --git a/tests/components/config/test_hassbian.py b/tests/components/config/test_hassbian.py
index 9038ccc6aa4e4ac85c4186a93eefd74374bb9ad0..85fbf0c2e5a899875326d714c12a04d8f54c2d53 100644
--- a/tests/components/config/test_hassbian.py
+++ b/tests/components/config/test_hassbian.py
@@ -34,13 +34,13 @@ def test_setup_check_env_works(hass, loop):
@asyncio.coroutine
-def test_get_suites(hass, test_client):
+def test_get_suites(hass, aiohttp_client):
"""Test getting suites."""
with patch.dict(os.environ, {'FORCE_HASSBIAN': '1'}), \
patch.object(config, 'SECTIONS', ['hassbian']):
yield from async_setup_component(hass, 'config', {})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.get('/api/config/hassbian/suites')
assert resp.status == 200
result = yield from resp.json()
@@ -53,13 +53,13 @@ def test_get_suites(hass, test_client):
@asyncio.coroutine
-def test_install_suite(hass, test_client):
+def test_install_suite(hass, aiohttp_client):
"""Test getting suites."""
with patch.dict(os.environ, {'FORCE_HASSBIAN': '1'}), \
patch.object(config, 'SECTIONS', ['hassbian']):
yield from async_setup_component(hass, 'config', {})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.post(
'/api/config/hassbian/suites/openzwave/install')
assert resp.status == 200
diff --git a/tests/components/config/test_init.py b/tests/components/config/test_init.py
index 2d5d814ac8a9edbbebbfd04d364b501c44788148..57ea7e7a492a4012d971f70c0c0afcc2467d591e 100644
--- a/tests/components/config/test_init.py
+++ b/tests/components/config/test_init.py
@@ -17,7 +17,7 @@ def test_config_setup(hass, loop):
@asyncio.coroutine
-def test_load_on_demand_already_loaded(hass, test_client):
+def test_load_on_demand_already_loaded(hass, aiohttp_client):
"""Test getting suites."""
mock_component(hass, 'zwave')
@@ -34,7 +34,7 @@ def test_load_on_demand_already_loaded(hass, test_client):
@asyncio.coroutine
-def test_load_on_demand_on_load(hass, test_client):
+def test_load_on_demand_on_load(hass, aiohttp_client):
"""Test getting suites."""
with patch.object(config, 'SECTIONS', []), \
patch.object(config, 'ON_DEMAND', ['zwave']):
diff --git a/tests/components/config/test_zwave.py b/tests/components/config/test_zwave.py
index c98385a3c32be02288813a3a44dba3b214b4b701..672bafeaf2825dc42427e4435b8353b80e9455a3 100644
--- a/tests/components/config/test_zwave.py
+++ b/tests/components/config/test_zwave.py
@@ -16,12 +16,12 @@ VIEW_NAME = 'api:config:zwave:device_config'
@pytest.fixture
-def client(loop, hass, test_client):
+def client(loop, hass, aiohttp_client):
"""Client to communicate with Z-Wave config views."""
with patch.object(config, 'SECTIONS', ['zwave']):
loop.run_until_complete(async_setup_component(hass, 'config', {}))
- return loop.run_until_complete(test_client(hass.http.app))
+ return loop.run_until_complete(aiohttp_client(hass.http.app))
@asyncio.coroutine
diff --git a/tests/components/device_tracker/test_geofency.py b/tests/components/device_tracker/test_geofency.py
index 5def6a217f4b147d57752e88c50a864269f382d5..a955dd0cc118fd01b58af382d37ad09adf293729 100644
--- a/tests/components/device_tracker/test_geofency.py
+++ b/tests/components/device_tracker/test_geofency.py
@@ -107,7 +107,7 @@ BEACON_EXIT_CAR = {
@pytest.fixture
-def geofency_client(loop, hass, test_client):
+def geofency_client(loop, hass, aiohttp_client):
"""Geofency mock client."""
assert loop.run_until_complete(async_setup_component(
hass, device_tracker.DOMAIN, {
@@ -117,7 +117,7 @@ def geofency_client(loop, hass, test_client):
}}))
with patch('homeassistant.components.device_tracker.update_config'):
- yield loop.run_until_complete(test_client(hass.http.app))
+ yield loop.run_until_complete(aiohttp_client(hass.http.app))
@pytest.fixture(autouse=True)
diff --git a/tests/components/device_tracker/test_locative.py b/tests/components/device_tracker/test_locative.py
index 2476247e069bd40c304802e3e93782bbf513e141..90adccf770319abeeb28d4ce8c79df48f77b3693 100644
--- a/tests/components/device_tracker/test_locative.py
+++ b/tests/components/device_tracker/test_locative.py
@@ -19,7 +19,7 @@ def _url(data=None):
@pytest.fixture
-def locative_client(loop, hass, test_client):
+def locative_client(loop, hass, aiohttp_client):
"""Locative mock client."""
assert loop.run_until_complete(async_setup_component(
hass, device_tracker.DOMAIN, {
@@ -29,7 +29,7 @@ def locative_client(loop, hass, test_client):
}))
with patch('homeassistant.components.device_tracker.update_config'):
- yield loop.run_until_complete(test_client(hass.http.app))
+ yield loop.run_until_complete(aiohttp_client(hass.http.app))
@asyncio.coroutine
diff --git a/tests/components/device_tracker/test_meraki.py b/tests/components/device_tracker/test_meraki.py
index 74fc577bca81ad512e81a17ebba495ad6da487d3..925ba6d66db52f7c05d61cb524d6b037f7a71428 100644
--- a/tests/components/device_tracker/test_meraki.py
+++ b/tests/components/device_tracker/test_meraki.py
@@ -13,7 +13,7 @@ from homeassistant.components.device_tracker.meraki import URL
@pytest.fixture
-def meraki_client(loop, hass, test_client):
+def meraki_client(loop, hass, aiohttp_client):
"""Meraki mock client."""
assert loop.run_until_complete(async_setup_component(
hass, device_tracker.DOMAIN, {
@@ -25,7 +25,7 @@ def meraki_client(loop, hass, test_client):
}
}))
- yield loop.run_until_complete(test_client(hass.http.app))
+ yield loop.run_until_complete(aiohttp_client(hass.http.app))
@asyncio.coroutine
diff --git a/tests/components/device_tracker/test_owntracks_http.py b/tests/components/device_tracker/test_owntracks_http.py
index be8bdd94ecc6b18c80bd62a4b26c62c55f3f8ae1..d7b48cafe46dc05d5e51cad96d3d4d98fbf457f7 100644
--- a/tests/components/device_tracker/test_owntracks_http.py
+++ b/tests/components/device_tracker/test_owntracks_http.py
@@ -10,7 +10,7 @@ from tests.common import mock_coro, mock_component
@pytest.fixture
-def mock_client(hass, test_client):
+def mock_client(hass, aiohttp_client):
"""Start the Hass HTTP component."""
mock_component(hass, 'group')
mock_component(hass, 'zone')
@@ -22,7 +22,7 @@ def mock_client(hass, test_client):
'platform': 'owntracks_http'
}
}))
- return hass.loop.run_until_complete(test_client(hass.http.app))
+ return hass.loop.run_until_complete(aiohttp_client(hass.http.app))
@pytest.fixture
diff --git a/tests/components/emulated_hue/test_hue_api.py b/tests/components/emulated_hue/test_hue_api.py
index 91988a76212a1ec94affec569b09e375879ba739..1617f327d27baa4238f5bef74613161a00b6228b 100644
--- a/tests/components/emulated_hue/test_hue_api.py
+++ b/tests/components/emulated_hue/test_hue_api.py
@@ -118,7 +118,7 @@ def hass_hue(loop, hass):
@pytest.fixture
-def hue_client(loop, hass_hue, test_client):
+def hue_client(loop, hass_hue, aiohttp_client):
"""Create web client for emulated hue api."""
web_app = hass_hue.http.app
config = Config(None, {
@@ -135,7 +135,7 @@ def hue_client(loop, hass_hue, test_client):
HueOneLightStateView(config).register(web_app.router)
HueOneLightChangeView(config).register(web_app.router)
- return loop.run_until_complete(test_client(web_app))
+ return loop.run_until_complete(aiohttp_client(web_app))
@asyncio.coroutine
diff --git a/tests/components/google_assistant/test_google_assistant.py b/tests/components/google_assistant/test_google_assistant.py
index cb319b67bb225cdf83afe79cc15e1cc732990700..d45680d132e532a5a945f7003afd33fff8b9d20a 100644
--- a/tests/components/google_assistant/test_google_assistant.py
+++ b/tests/components/google_assistant/test_google_assistant.py
@@ -27,7 +27,7 @@ AUTH_HEADER = {AUTHORIZATION: 'Bearer {}'.format(ACCESS_TOKEN)}
@pytest.fixture
-def assistant_client(loop, hass, test_client):
+def assistant_client(loop, hass, aiohttp_client):
"""Create web client for the Google Assistant API."""
loop.run_until_complete(
setup.async_setup_component(hass, 'google_assistant', {
@@ -44,7 +44,7 @@ def assistant_client(loop, hass, test_client):
}
}))
- return loop.run_until_complete(test_client(hass.http.app))
+ return loop.run_until_complete(aiohttp_client(hass.http.app))
@pytest.fixture
diff --git a/tests/components/hassio/conftest.py b/tests/components/hassio/conftest.py
index 56d6cbe666e5e438b2497865848ec105caca093b..9f20efc08a5b139d390a8a42d11aed700c5b9435 100644
--- a/tests/components/hassio/conftest.py
+++ b/tests/components/hassio/conftest.py
@@ -26,7 +26,7 @@ def hassio_env():
@pytest.fixture
-def hassio_client(hassio_env, hass, test_client):
+def hassio_client(hassio_env, hass, aiohttp_client):
"""Create mock hassio http client."""
with patch('homeassistant.components.hassio.HassIO.update_hass_api',
Mock(return_value=mock_coro({"result": "ok"}))), \
@@ -38,7 +38,7 @@ def hassio_client(hassio_env, hass, test_client):
'api_password': API_PASSWORD
}
}))
- yield hass.loop.run_until_complete(test_client(hass.http.app))
+ yield hass.loop.run_until_complete(aiohttp_client(hass.http.app))
@pytest.fixture
diff --git a/tests/components/http/test_auth.py b/tests/components/http/test_auth.py
index 604ee9c0c9b4fa86fd6e286ff15561a90074f664..a44d17d513db98aa92c802f3dc494c3190eb0cbe 100644
--- a/tests/components/http/test_auth.py
+++ b/tests/components/http/test_auth.py
@@ -55,19 +55,19 @@ async def test_auth_middleware_loaded_by_default(hass):
assert len(mock_setup.mock_calls) == 1
-async def test_access_without_password(app, test_client):
+async def test_access_without_password(app, aiohttp_client):
"""Test access without password."""
setup_auth(app, [], None)
- client = await test_client(app)
+ client = await aiohttp_client(app)
resp = await client.get('/')
assert resp.status == 200
-async def test_access_with_password_in_header(app, test_client):
+async def test_access_with_password_in_header(app, aiohttp_client):
"""Test access with password in URL."""
setup_auth(app, [], API_PASSWORD)
- client = await test_client(app)
+ client = await aiohttp_client(app)
req = await client.get(
'/', headers={HTTP_HEADER_HA_AUTH: API_PASSWORD})
@@ -78,10 +78,10 @@ async def test_access_with_password_in_header(app, test_client):
assert req.status == 401
-async def test_access_with_password_in_query(app, test_client):
+async def test_access_with_password_in_query(app, aiohttp_client):
"""Test access without password."""
setup_auth(app, [], API_PASSWORD)
- client = await test_client(app)
+ client = await aiohttp_client(app)
resp = await client.get('/', params={
'api_password': API_PASSWORD
@@ -97,10 +97,10 @@ async def test_access_with_password_in_query(app, test_client):
assert resp.status == 401
-async def test_basic_auth_works(app, test_client):
+async def test_basic_auth_works(app, aiohttp_client):
"""Test access with basic authentication."""
setup_auth(app, [], API_PASSWORD)
- client = await test_client(app)
+ client = await aiohttp_client(app)
req = await client.get(
'/',
@@ -125,7 +125,7 @@ async def test_basic_auth_works(app, test_client):
assert req.status == 401
-async def test_access_with_trusted_ip(test_client):
+async def test_access_with_trusted_ip(aiohttp_client):
"""Test access with an untrusted ip address."""
app = web.Application()
app.router.add_get('/', mock_handler)
@@ -133,7 +133,7 @@ async def test_access_with_trusted_ip(test_client):
setup_auth(app, TRUSTED_NETWORKS, 'some-pass')
set_mock_ip = mock_real_ip(app)
- client = await test_client(app)
+ client = await aiohttp_client(app)
for remote_addr in UNTRUSTED_ADDRESSES:
set_mock_ip(remote_addr)
diff --git a/tests/components/http/test_ban.py b/tests/components/http/test_ban.py
index 2d7885d959f7dbd5986e0d6a598be8d936ecec2f..c5691cf3e2ac278fe961ddd7445dab065618f4e1 100644
--- a/tests/components/http/test_ban.py
+++ b/tests/components/http/test_ban.py
@@ -15,7 +15,7 @@ from . import mock_real_ip
BANNED_IPS = ['200.201.202.203', '100.64.0.2']
-async def test_access_from_banned_ip(hass, test_client):
+async def test_access_from_banned_ip(hass, aiohttp_client):
"""Test accessing to server from banned IP. Both trusted and not."""
app = web.Application()
setup_bans(hass, app, 5)
@@ -24,7 +24,7 @@ async def test_access_from_banned_ip(hass, test_client):
with patch('homeassistant.components.http.ban.load_ip_bans_config',
return_value=[IpBan(banned_ip) for banned_ip
in BANNED_IPS]):
- client = await test_client(app)
+ client = await aiohttp_client(app)
for remote_addr in BANNED_IPS:
set_real_ip(remote_addr)
@@ -54,7 +54,7 @@ async def test_ban_middleware_loaded_by_default(hass):
assert len(mock_setup.mock_calls) == 1
-async def test_ip_bans_file_creation(hass, test_client):
+async def test_ip_bans_file_creation(hass, aiohttp_client):
"""Testing if banned IP file created."""
app = web.Application()
app['hass'] = hass
@@ -70,7 +70,7 @@ async def test_ip_bans_file_creation(hass, test_client):
with patch('homeassistant.components.http.ban.load_ip_bans_config',
return_value=[IpBan(banned_ip) for banned_ip
in BANNED_IPS]):
- client = await test_client(app)
+ client = await aiohttp_client(app)
m = mock_open()
diff --git a/tests/components/http/test_cors.py b/tests/components/http/test_cors.py
index 50464b362778d21df90bfeeb791dc0e6c68fa07c..27367b4173e3f126935222be2651aa272f31316d 100644
--- a/tests/components/http/test_cors.py
+++ b/tests/components/http/test_cors.py
@@ -47,12 +47,12 @@ async def mock_handler(request):
@pytest.fixture
-def client(loop, test_client):
+def client(loop, aiohttp_client):
"""Fixture to setup a web.Application."""
app = web.Application()
app.router.add_get('/', mock_handler)
setup_cors(app, [TRUSTED_ORIGIN])
- return loop.run_until_complete(test_client(app))
+ return loop.run_until_complete(aiohttp_client(app))
async def test_cors_requests(client):
diff --git a/tests/components/http/test_data_validator.py b/tests/components/http/test_data_validator.py
index 6cca1af8ccc99d1fa6eb0aae08d89a1af59e7043..2b966daff6cf9a3f352b3b1bc26c9545b9773842 100644
--- a/tests/components/http/test_data_validator.py
+++ b/tests/components/http/test_data_validator.py
@@ -8,7 +8,7 @@ from homeassistant.components.http import HomeAssistantView
from homeassistant.components.http.data_validator import RequestDataValidator
-async def get_client(test_client, validator):
+async def get_client(aiohttp_client, validator):
"""Generate a client that hits a view decorated with validator."""
app = web.Application()
app['hass'] = Mock(is_running=True)
@@ -24,14 +24,14 @@ async def get_client(test_client, validator):
return b''
TestView().register(app.router)
- client = await test_client(app)
+ client = await aiohttp_client(app)
return client
-async def test_validator(test_client):
+async def test_validator(aiohttp_client):
"""Test the validator."""
client = await get_client(
- test_client, RequestDataValidator(vol.Schema({
+ aiohttp_client, RequestDataValidator(vol.Schema({
vol.Required('test'): str
})))
@@ -49,10 +49,10 @@ async def test_validator(test_client):
assert resp.status == 400
-async def test_validator_allow_empty(test_client):
+async def test_validator_allow_empty(aiohttp_client):
"""Test the validator with empty data."""
client = await get_client(
- test_client, RequestDataValidator(vol.Schema({
+ aiohttp_client, RequestDataValidator(vol.Schema({
# Although we allow empty, our schema should still be able
# to validate an empty dict.
vol.Optional('test'): str
diff --git a/tests/components/http/test_init.py b/tests/components/http/test_init.py
index 1dcf45f48c3179452fd65ebfb5b6da5e718038af..c02e203444fc4af2a18cc1dc67ebc3335ede22e4 100644
--- a/tests/components/http/test_init.py
+++ b/tests/components/http/test_init.py
@@ -15,12 +15,13 @@ class TestView(http.HomeAssistantView):
return 'hello'
-async def test_registering_view_while_running(hass, test_client, unused_port):
+async def test_registering_view_while_running(hass, aiohttp_client,
+ aiohttp_unused_port):
"""Test that we can register a view while the server is running."""
await async_setup_component(
hass, http.DOMAIN, {
http.DOMAIN: {
- http.CONF_SERVER_PORT: unused_port(),
+ http.CONF_SERVER_PORT: aiohttp_unused_port(),
}
}
)
@@ -73,17 +74,16 @@ async def test_api_no_base_url(hass):
assert hass.config.api.base_url == 'http://127.0.0.1:8123'
-async def test_not_log_password(hass, unused_port, test_client, caplog):
+async def test_not_log_password(hass, aiohttp_client, caplog):
"""Test access with password doesn't get logged."""
result = await async_setup_component(hass, 'api', {
'http': {
- http.CONF_SERVER_PORT: unused_port(),
http.CONF_API_PASSWORD: 'some-pass'
}
})
assert result
- client = await test_client(hass.http.app)
+ client = await aiohttp_client(hass.http.app)
resp = await client.get('/api/', params={
'api_password': 'some-pass'
diff --git a/tests/components/http/test_real_ip.py b/tests/components/http/test_real_ip.py
index 3e4f902353758c56643c0b75f3140aac15f474e8..61846eb94c242f2f167bd6d3b31efbdb6efc0335 100644
--- a/tests/components/http/test_real_ip.py
+++ b/tests/components/http/test_real_ip.py
@@ -11,13 +11,13 @@ async def mock_handler(request):
return web.Response(text=str(request[KEY_REAL_IP]))
-async def test_ignore_x_forwarded_for(test_client):
+async def test_ignore_x_forwarded_for(aiohttp_client):
"""Test that we get the IP from the transport."""
app = web.Application()
app.router.add_get('/', mock_handler)
setup_real_ip(app, False)
- mock_api_client = await test_client(app)
+ mock_api_client = await aiohttp_client(app)
resp = await mock_api_client.get('/', headers={
X_FORWARDED_FOR: '255.255.255.255'
@@ -27,13 +27,13 @@ async def test_ignore_x_forwarded_for(test_client):
assert text != '255.255.255.255'
-async def test_use_x_forwarded_for(test_client):
+async def test_use_x_forwarded_for(aiohttp_client):
"""Test that we get the IP from the transport."""
app = web.Application()
app.router.add_get('/', mock_handler)
setup_real_ip(app, True)
- mock_api_client = await test_client(app)
+ mock_api_client = await aiohttp_client(app)
resp = await mock_api_client.get('/', headers={
X_FORWARDED_FOR: '255.255.255.255'
diff --git a/tests/components/mailbox/test_init.py b/tests/components/mailbox/test_init.py
index c9267fa8e8eebdedc2178cde6a7795e03dc6346c..3377fcefcf5afb45478db34f05a503b831c6df2c 100644
--- a/tests/components/mailbox/test_init.py
+++ b/tests/components/mailbox/test_init.py
@@ -9,7 +9,7 @@ import homeassistant.components.mailbox as mailbox
@pytest.fixture
-def mock_http_client(hass, test_client):
+def mock_http_client(hass, aiohttp_client):
"""Start the Hass HTTP component."""
config = {
mailbox.DOMAIN: {
@@ -18,7 +18,7 @@ def mock_http_client(hass, test_client):
}
hass.loop.run_until_complete(
async_setup_component(hass, mailbox.DOMAIN, config))
- return hass.loop.run_until_complete(test_client(hass.http.app))
+ return hass.loop.run_until_complete(aiohttp_client(hass.http.app))
@asyncio.coroutine
diff --git a/tests/components/mqtt/test_init.py b/tests/components/mqtt/test_init.py
index 1dd89a92f043b79a44da66306367ae73431db012..b25479bb75acdf1b0b0134397c99b068ee4532d4 100644
--- a/tests/components/mqtt/test_init.py
+++ b/tests/components/mqtt/test_init.py
@@ -59,7 +59,7 @@ class TestMQTTComponent(unittest.TestCase):
"""Helper for recording calls."""
self.calls.append(args)
- def test_client_stops_on_home_assistant_start(self):
+ def aiohttp_client_stops_on_home_assistant_start(self):
"""Test if client stops on HA stop."""
self.hass.bus.fire(EVENT_HOMEASSISTANT_STOP)
self.hass.block_till_done()
@@ -156,7 +156,7 @@ class TestMQTTCallbacks(unittest.TestCase):
"""Helper for recording calls."""
self.calls.append(args)
- def test_client_starts_on_home_assistant_mqtt_setup(self):
+ def aiohttp_client_starts_on_home_assistant_mqtt_setup(self):
"""Test if client is connected after mqtt init on bootstrap."""
self.assertEqual(self.hass.data['mqtt']._mqttc.connect.call_count, 1)
diff --git a/tests/components/notify/test_html5.py b/tests/components/notify/test_html5.py
index 9ec71020ef1b52c244ebf9cbf629019d04331688..318f3c7512ca70d1cc7bd9a4d46560ea1cd3de43 100644
--- a/tests/components/notify/test_html5.py
+++ b/tests/components/notify/test_html5.py
@@ -49,7 +49,7 @@ REGISTER_URL = '/api/notify.html5'
PUBLISH_URL = '/api/notify.html5/callback'
-async def mock_client(hass, test_client, registrations=None):
+async def mock_client(hass, aiohttp_client, registrations=None):
"""Create a test client for HTML5 views."""
if registrations is None:
registrations = {}
@@ -62,7 +62,7 @@ async def mock_client(hass, test_client, registrations=None):
}
})
- return await test_client(hass.http.app)
+ return await aiohttp_client(hass.http.app)
class TestHtml5Notify(object):
@@ -151,9 +151,9 @@ class TestHtml5Notify(object):
assert mock_wp.mock_calls[4][2]['gcm_key'] is None
-async def test_registering_new_device_view(hass, test_client):
+async def test_registering_new_device_view(hass, aiohttp_client):
"""Test that the HTML view works."""
- client = await mock_client(hass, test_client)
+ client = await mock_client(hass, aiohttp_client)
with patch('homeassistant.components.notify.html5.save_json') as mock_save:
resp = await client.post(REGISTER_URL, data=json.dumps(SUBSCRIPTION_1))
@@ -165,9 +165,9 @@ async def test_registering_new_device_view(hass, test_client):
}
-async def test_registering_new_device_expiration_view(hass, test_client):
+async def test_registering_new_device_expiration_view(hass, aiohttp_client):
"""Test that the HTML view works."""
- client = await mock_client(hass, test_client)
+ client = await mock_client(hass, aiohttp_client)
with patch('homeassistant.components.notify.html5.save_json') as mock_save:
resp = await client.post(REGISTER_URL, data=json.dumps(SUBSCRIPTION_4))
@@ -178,10 +178,10 @@ async def test_registering_new_device_expiration_view(hass, test_client):
}
-async def test_registering_new_device_fails_view(hass, test_client):
+async def test_registering_new_device_fails_view(hass, aiohttp_client):
"""Test subs. are not altered when registering a new device fails."""
registrations = {}
- client = await mock_client(hass, test_client, registrations)
+ client = await mock_client(hass, aiohttp_client, registrations)
with patch('homeassistant.components.notify.html5.save_json',
side_effect=HomeAssistantError()):
@@ -191,10 +191,10 @@ async def test_registering_new_device_fails_view(hass, test_client):
assert registrations == {}
-async def test_registering_existing_device_view(hass, test_client):
+async def test_registering_existing_device_view(hass, aiohttp_client):
"""Test subscription is updated when registering existing device."""
registrations = {}
- client = await mock_client(hass, test_client, registrations)
+ client = await mock_client(hass, aiohttp_client, registrations)
with patch('homeassistant.components.notify.html5.save_json') as mock_save:
await client.post(REGISTER_URL, data=json.dumps(SUBSCRIPTION_1))
@@ -209,10 +209,10 @@ async def test_registering_existing_device_view(hass, test_client):
}
-async def test_registering_existing_device_fails_view(hass, test_client):
+async def test_registering_existing_device_fails_view(hass, aiohttp_client):
"""Test sub. is not updated when registering existing device fails."""
registrations = {}
- client = await mock_client(hass, test_client, registrations)
+ client = await mock_client(hass, aiohttp_client, registrations)
with patch('homeassistant.components.notify.html5.save_json') as mock_save:
await client.post(REGISTER_URL, data=json.dumps(SUBSCRIPTION_1))
@@ -225,9 +225,9 @@ async def test_registering_existing_device_fails_view(hass, test_client):
}
-async def test_registering_new_device_validation(hass, test_client):
+async def test_registering_new_device_validation(hass, aiohttp_client):
"""Test various errors when registering a new device."""
- client = await mock_client(hass, test_client)
+ client = await mock_client(hass, aiohttp_client)
resp = await client.post(REGISTER_URL, data=json.dumps({
'browser': 'invalid browser',
@@ -249,13 +249,13 @@ async def test_registering_new_device_validation(hass, test_client):
assert resp.status == 400
-async def test_unregistering_device_view(hass, test_client):
+async def test_unregistering_device_view(hass, aiohttp_client):
"""Test that the HTML unregister view works."""
registrations = {
'some device': SUBSCRIPTION_1,
'other device': SUBSCRIPTION_2,
}
- client = await mock_client(hass, test_client, registrations)
+ client = await mock_client(hass, aiohttp_client, registrations)
with patch('homeassistant.components.notify.html5.save_json') as mock_save:
resp = await client.delete(REGISTER_URL, data=json.dumps({
@@ -269,11 +269,11 @@ async def test_unregistering_device_view(hass, test_client):
}
-async def test_unregister_device_view_handle_unknown_subscription(hass,
- test_client):
+async def test_unregister_device_view_handle_unknown_subscription(
+ hass, aiohttp_client):
"""Test that the HTML unregister view handles unknown subscriptions."""
registrations = {}
- client = await mock_client(hass, test_client, registrations)
+ client = await mock_client(hass, aiohttp_client, registrations)
with patch('homeassistant.components.notify.html5.save_json') as mock_save:
resp = await client.delete(REGISTER_URL, data=json.dumps({
@@ -285,13 +285,14 @@ async def test_unregister_device_view_handle_unknown_subscription(hass,
assert len(mock_save.mock_calls) == 0
-async def test_unregistering_device_view_handles_save_error(hass, test_client):
+async def test_unregistering_device_view_handles_save_error(
+ hass, aiohttp_client):
"""Test that the HTML unregister view handles save errors."""
registrations = {
'some device': SUBSCRIPTION_1,
'other device': SUBSCRIPTION_2,
}
- client = await mock_client(hass, test_client, registrations)
+ client = await mock_client(hass, aiohttp_client, registrations)
with patch('homeassistant.components.notify.html5.save_json',
side_effect=HomeAssistantError()):
@@ -306,9 +307,9 @@ async def test_unregistering_device_view_handles_save_error(hass, test_client):
}
-async def test_callback_view_no_jwt(hass, test_client):
+async def test_callback_view_no_jwt(hass, aiohttp_client):
"""Test that the notification callback view works without JWT."""
- client = await mock_client(hass, test_client)
+ client = await mock_client(hass, aiohttp_client)
resp = await client.post(PUBLISH_URL, data=json.dumps({
'type': 'push',
'tag': '3bc28d69-0921-41f1-ac6a-7a627ba0aa72'
@@ -317,12 +318,12 @@ async def test_callback_view_no_jwt(hass, test_client):
assert resp.status == 401, resp.response
-async def test_callback_view_with_jwt(hass, test_client):
+async def test_callback_view_with_jwt(hass, aiohttp_client):
"""Test that the notification callback view works with JWT."""
registrations = {
'device': SUBSCRIPTION_1
}
- client = await mock_client(hass, test_client, registrations)
+ client = await mock_client(hass, aiohttp_client, registrations)
with patch('pywebpush.WebPusher') as mock_wp:
await hass.services.async_call('notify', 'notify', {
diff --git a/tests/components/sensor/test_mhz19.py b/tests/components/sensor/test_mhz19.py
index 6948a952c315557a7fb85f654d17c21b371aa017..6d0714896911b3b096a3b9e40b1ed5c39f2851d6 100644
--- a/tests/components/sensor/test_mhz19.py
+++ b/tests/components/sensor/test_mhz19.py
@@ -52,7 +52,7 @@ class TestMHZ19Sensor(unittest.TestCase):
@patch('pmsensor.co2sensor.read_mh_z19_with_temperature',
side_effect=OSError('test error'))
- def test_client_update_oserror(self, mock_function):
+ def aiohttp_client_update_oserror(self, mock_function):
"""Test MHZClient when library throws OSError."""
from pmsensor import co2sensor
client = mhz19.MHZClient(co2sensor, 'test.serial')
@@ -61,7 +61,7 @@ class TestMHZ19Sensor(unittest.TestCase):
@patch('pmsensor.co2sensor.read_mh_z19_with_temperature',
return_value=(5001, 24))
- def test_client_update_ppm_overflow(self, mock_function):
+ def aiohttp_client_update_ppm_overflow(self, mock_function):
"""Test MHZClient when ppm is too high."""
from pmsensor import co2sensor
client = mhz19.MHZClient(co2sensor, 'test.serial')
@@ -70,7 +70,7 @@ class TestMHZ19Sensor(unittest.TestCase):
@patch('pmsensor.co2sensor.read_mh_z19_with_temperature',
return_value=(1000, 24))
- def test_client_update_good_read(self, mock_function):
+ def aiohttp_client_update_good_read(self, mock_function):
"""Test MHZClient when ppm is too high."""
from pmsensor import co2sensor
client = mhz19.MHZClient(co2sensor, 'test.serial')
diff --git a/tests/components/test_api.py b/tests/components/test_api.py
index 69b9bfa69decf05e32ceec5d40acb9212778efc1..6d5bec046f1ae0b9388d381d0543e726fd48dae8 100644
--- a/tests/components/test_api.py
+++ b/tests/components/test_api.py
@@ -11,10 +11,10 @@ from homeassistant.setup import async_setup_component
@pytest.fixture
-def mock_api_client(hass, test_client):
+def mock_api_client(hass, aiohttp_client):
"""Start the Hass HTTP component."""
hass.loop.run_until_complete(async_setup_component(hass, 'api', {}))
- return hass.loop.run_until_complete(test_client(hass.http.app))
+ return hass.loop.run_until_complete(aiohttp_client(hass.http.app))
@asyncio.coroutine
diff --git a/tests/components/test_conversation.py b/tests/components/test_conversation.py
index 466dc57017a2e0ecd97bf4f3c9ac0ec4de644365..bde00e10928c0266ce83f173663fb151d753f3af 100644
--- a/tests/components/test_conversation.py
+++ b/tests/components/test_conversation.py
@@ -93,7 +93,7 @@ def test_register_before_setup(hass):
@asyncio.coroutine
-def test_http_processing_intent(hass, test_client):
+def test_http_processing_intent(hass, aiohttp_client):
"""Test processing intent via HTTP API."""
class TestIntentHandler(intent.IntentHandler):
intent_type = 'OrderBeer'
@@ -122,7 +122,7 @@ def test_http_processing_intent(hass, test_client):
})
assert result
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.post('/api/conversation/process', json={
'text': 'I would like the Grolsch beer'
})
@@ -224,7 +224,7 @@ def test_toggle_intent(hass, sentence):
@asyncio.coroutine
-def test_http_api(hass, test_client):
+def test_http_api(hass, aiohttp_client):
"""Test the HTTP conversation API."""
result = yield from component.async_setup(hass, {})
assert result
@@ -232,7 +232,7 @@ def test_http_api(hass, test_client):
result = yield from async_setup_component(hass, 'conversation', {})
assert result
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
hass.states.async_set('light.kitchen', 'off')
calls = async_mock_service(hass, 'homeassistant', 'turn_on')
@@ -249,7 +249,7 @@ def test_http_api(hass, test_client):
@asyncio.coroutine
-def test_http_api_wrong_data(hass, test_client):
+def test_http_api_wrong_data(hass, aiohttp_client):
"""Test the HTTP conversation API."""
result = yield from component.async_setup(hass, {})
assert result
@@ -257,7 +257,7 @@ def test_http_api_wrong_data(hass, test_client):
result = yield from async_setup_component(hass, 'conversation', {})
assert result
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.post('/api/conversation/process', json={
'text': 123
diff --git a/tests/components/test_frontend.py b/tests/components/test_frontend.py
index c4ade7f5c19d6d12af12a781b273e706aaa3e138..c742e21573862d9d77ec42187a11e61dc673dad3 100644
--- a/tests/components/test_frontend.py
+++ b/tests/components/test_frontend.py
@@ -12,14 +12,14 @@ from homeassistant.components.frontend import (
@pytest.fixture
-def mock_http_client(hass, test_client):
+def mock_http_client(hass, aiohttp_client):
"""Start the Hass HTTP component."""
hass.loop.run_until_complete(async_setup_component(hass, 'frontend', {}))
- return hass.loop.run_until_complete(test_client(hass.http.app))
+ return hass.loop.run_until_complete(aiohttp_client(hass.http.app))
@pytest.fixture
-def mock_http_client_with_themes(hass, test_client):
+def mock_http_client_with_themes(hass, aiohttp_client):
"""Start the Hass HTTP component."""
hass.loop.run_until_complete(async_setup_component(hass, 'frontend', {
DOMAIN: {
@@ -29,11 +29,11 @@ def mock_http_client_with_themes(hass, test_client):
}
}
}}))
- return hass.loop.run_until_complete(test_client(hass.http.app))
+ return hass.loop.run_until_complete(aiohttp_client(hass.http.app))
@pytest.fixture
-def mock_http_client_with_urls(hass, test_client):
+def mock_http_client_with_urls(hass, aiohttp_client):
"""Start the Hass HTTP component."""
hass.loop.run_until_complete(async_setup_component(hass, 'frontend', {
DOMAIN: {
@@ -42,7 +42,7 @@ def mock_http_client_with_urls(hass, test_client):
CONF_EXTRA_HTML_URL_ES5:
["https://domain.com/my_extra_url_es5.html"]
}}))
- return hass.loop.run_until_complete(test_client(hass.http.app))
+ return hass.loop.run_until_complete(aiohttp_client(hass.http.app))
@asyncio.coroutine
diff --git a/tests/components/test_prometheus.py b/tests/components/test_prometheus.py
index 052292b015d33c7a18bcfd07d676914b9b126860..6cc0e4fcadab63081fbb6c0d5441850911eef693 100644
--- a/tests/components/test_prometheus.py
+++ b/tests/components/test_prometheus.py
@@ -7,14 +7,14 @@ import homeassistant.components.prometheus as prometheus
@pytest.fixture
-def prometheus_client(loop, hass, test_client):
- """Initialize a test_client with Prometheus component."""
+def prometheus_client(loop, hass, aiohttp_client):
+ """Initialize a aiohttp_client with Prometheus component."""
assert loop.run_until_complete(async_setup_component(
hass,
prometheus.DOMAIN,
{},
))
- return loop.run_until_complete(test_client(hass.http.app))
+ return loop.run_until_complete(aiohttp_client(hass.http.app))
@asyncio.coroutine
diff --git a/tests/components/test_ring.py b/tests/components/test_ring.py
index 819f447f2f5f10b51beed70a53d800e2f7155477..3837ec130611e7a4c654787891dccbe95f7bde13 100644
--- a/tests/components/test_ring.py
+++ b/tests/components/test_ring.py
@@ -1,4 +1,5 @@
"""The tests for the Ring component."""
+from copy import deepcopy
import os
import unittest
import requests_mock
@@ -51,7 +52,7 @@ class TestRing(unittest.TestCase):
"""Test the setup when no login is configured."""
mock.post('https://api.ring.com/clients_api/session',
text=load_fixture('ring_session.json'))
- conf = self.config.copy()
+ conf = deepcopy(VALID_CONFIG)
del conf['ring']['username']
assert not setup.setup_component(self.hass, ring.DOMAIN, conf)
@@ -60,6 +61,6 @@ class TestRing(unittest.TestCase):
"""Test the setup when no password is configured."""
mock.post('https://api.ring.com/clients_api/session',
text=load_fixture('ring_session.json'))
- conf = self.config.copy()
+ conf = deepcopy(VALID_CONFIG)
del conf['ring']['password']
assert not setup.setup_component(self.hass, ring.DOMAIN, conf)
diff --git a/tests/components/test_rss_feed_template.py b/tests/components/test_rss_feed_template.py
index 8b16b5519e937b5945f90709275bdfc0002363c1..36f68e57c9fd0237f0f252a02db1a5f4a63ddb1b 100644
--- a/tests/components/test_rss_feed_template.py
+++ b/tests/components/test_rss_feed_template.py
@@ -8,7 +8,7 @@ from homeassistant.setup import async_setup_component
@pytest.fixture
-def mock_http_client(loop, hass, test_client):
+def mock_http_client(loop, hass, aiohttp_client):
"""Setup test fixture."""
config = {
'rss_feed_template': {
@@ -21,7 +21,7 @@ def mock_http_client(loop, hass, test_client):
loop.run_until_complete(async_setup_component(hass,
'rss_feed_template',
config))
- return loop.run_until_complete(test_client(hass.http.app))
+ return loop.run_until_complete(aiohttp_client(hass.http.app))
@asyncio.coroutine
diff --git a/tests/components/test_shopping_list.py b/tests/components/test_shopping_list.py
index 4203f7587aefa6e0df074a1dbe5d8e515a60a217..3131ae092a3155d3801326af11b55df093f160de 100644
--- a/tests/components/test_shopping_list.py
+++ b/tests/components/test_shopping_list.py
@@ -54,7 +54,7 @@ def test_recent_items_intent(hass):
@asyncio.coroutine
-def test_api_get_all(hass, test_client):
+def test_api_get_all(hass, aiohttp_client):
"""Test the API."""
yield from async_setup_component(hass, 'shopping_list', {})
@@ -65,7 +65,7 @@ def test_api_get_all(hass, test_client):
hass, 'test', 'HassShoppingListAddItem', {'item': {'value': 'wine'}}
)
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.get('/api/shopping_list')
assert resp.status == 200
@@ -78,7 +78,7 @@ def test_api_get_all(hass, test_client):
@asyncio.coroutine
-def test_api_update(hass, test_client):
+def test_api_update(hass, aiohttp_client):
"""Test the API."""
yield from async_setup_component(hass, 'shopping_list', {})
@@ -92,7 +92,7 @@ def test_api_update(hass, test_client):
beer_id = hass.data['shopping_list'].items[0]['id']
wine_id = hass.data['shopping_list'].items[1]['id']
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.post(
'/api/shopping_list/item/{}'.format(beer_id), json={
'name': 'soda'
@@ -133,7 +133,7 @@ def test_api_update(hass, test_client):
@asyncio.coroutine
-def test_api_update_fails(hass, test_client):
+def test_api_update_fails(hass, aiohttp_client):
"""Test the API."""
yield from async_setup_component(hass, 'shopping_list', {})
@@ -141,7 +141,7 @@ def test_api_update_fails(hass, test_client):
hass, 'test', 'HassShoppingListAddItem', {'item': {'value': 'beer'}}
)
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.post(
'/api/shopping_list/non_existing', json={
'name': 'soda'
@@ -159,7 +159,7 @@ def test_api_update_fails(hass, test_client):
@asyncio.coroutine
-def test_api_clear_completed(hass, test_client):
+def test_api_clear_completed(hass, aiohttp_client):
"""Test the API."""
yield from async_setup_component(hass, 'shopping_list', {})
@@ -173,7 +173,7 @@ def test_api_clear_completed(hass, test_client):
beer_id = hass.data['shopping_list'].items[0]['id']
wine_id = hass.data['shopping_list'].items[1]['id']
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
# Mark beer as completed
resp = yield from client.post(
@@ -196,11 +196,11 @@ def test_api_clear_completed(hass, test_client):
@asyncio.coroutine
-def test_api_create(hass, test_client):
+def test_api_create(hass, aiohttp_client):
"""Test the API."""
yield from async_setup_component(hass, 'shopping_list', {})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.post('/api/shopping_list/item', json={
'name': 'soda'
})
@@ -217,11 +217,11 @@ def test_api_create(hass, test_client):
@asyncio.coroutine
-def test_api_create_fail(hass, test_client):
+def test_api_create_fail(hass, aiohttp_client):
"""Test the API."""
yield from async_setup_component(hass, 'shopping_list', {})
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.post('/api/shopping_list/item', json={
'name': 1234
})
diff --git a/tests/components/test_system_log.py b/tests/components/test_system_log.py
index d119c60dba2ee02efa33289115817d3eb4ccfef8..c440ef9c30c9dd1167bda3c75bd3d79dda641895 100644
--- a/tests/components/test_system_log.py
+++ b/tests/components/test_system_log.py
@@ -14,16 +14,16 @@ _LOGGER = logging.getLogger('test_logger')
@pytest.fixture(autouse=True)
@asyncio.coroutine
-def setup_test_case(hass, test_client):
+def setup_test_case(hass, aiohttp_client):
"""Setup system_log component before test case."""
config = {'system_log': {'max_entries': 2}}
yield from async_setup_component(hass, system_log.DOMAIN, config)
@asyncio.coroutine
-def get_error_log(hass, test_client, expected_count):
+def get_error_log(hass, aiohttp_client, expected_count):
"""Fetch all entries from system_log via the API."""
- client = yield from test_client(hass.http.app)
+ client = yield from aiohttp_client(hass.http.app)
resp = yield from client.get('/api/error/all')
assert resp.status == 200
@@ -53,41 +53,41 @@ def get_frame(name):
@asyncio.coroutine
-def test_normal_logs(hass, test_client):
+def test_normal_logs(hass, aiohttp_client):
"""Test that debug and info are not logged."""
_LOGGER.debug('debug')
_LOGGER.info('info')
# Assert done by get_error_log
- yield from get_error_log(hass, test_client, 0)
+ yield from get_error_log(hass, aiohttp_client, 0)
@asyncio.coroutine
-def test_exception(hass, test_client):
+def test_exception(hass, aiohttp_client):
"""Test that exceptions are logged and retrieved correctly."""
_generate_and_log_exception('exception message', 'log message')
- log = (yield from get_error_log(hass, test_client, 1))[0]
+ log = (yield from get_error_log(hass, aiohttp_client, 1))[0]
assert_log(log, 'exception message', 'log message', 'ERROR')
@asyncio.coroutine
-def test_warning(hass, test_client):
+def test_warning(hass, aiohttp_client):
"""Test that warning are logged and retrieved correctly."""
_LOGGER.warning('warning message')
- log = (yield from get_error_log(hass, test_client, 1))[0]
+ log = (yield from get_error_log(hass, aiohttp_client, 1))[0]
assert_log(log, '', 'warning message', 'WARNING')
@asyncio.coroutine
-def test_error(hass, test_client):
+def test_error(hass, aiohttp_client):
"""Test that errors are logged and retrieved correctly."""
_LOGGER.error('error message')
- log = (yield from get_error_log(hass, test_client, 1))[0]
+ log = (yield from get_error_log(hass, aiohttp_client, 1))[0]
assert_log(log, '', 'error message', 'ERROR')
@asyncio.coroutine
-def test_error_posted_as_event(hass, test_client):
+def test_error_posted_as_event(hass, aiohttp_client):
"""Test that error are posted as events."""
events = []
@@ -106,26 +106,26 @@ def test_error_posted_as_event(hass, test_client):
@asyncio.coroutine
-def test_critical(hass, test_client):
+def test_critical(hass, aiohttp_client):
"""Test that critical are logged and retrieved correctly."""
_LOGGER.critical('critical message')
- log = (yield from get_error_log(hass, test_client, 1))[0]
+ log = (yield from get_error_log(hass, aiohttp_client, 1))[0]
assert_log(log, '', 'critical message', 'CRITICAL')
@asyncio.coroutine
-def test_remove_older_logs(hass, test_client):
+def test_remove_older_logs(hass, aiohttp_client):
"""Test that older logs are rotated out."""
_LOGGER.error('error message 1')
_LOGGER.error('error message 2')
_LOGGER.error('error message 3')
- log = yield from get_error_log(hass, test_client, 2)
+ log = yield from get_error_log(hass, aiohttp_client, 2)
assert_log(log[0], '', 'error message 3', 'ERROR')
assert_log(log[1], '', 'error message 2', 'ERROR')
@asyncio.coroutine
-def test_clear_logs(hass, test_client):
+def test_clear_logs(hass, aiohttp_client):
"""Test that the log can be cleared via a service call."""
_LOGGER.error('error message')
@@ -135,7 +135,7 @@ def test_clear_logs(hass, test_client):
yield from hass.async_block_till_done()
# Assert done by get_error_log
- yield from get_error_log(hass, test_client, 0)
+ yield from get_error_log(hass, aiohttp_client, 0)
@asyncio.coroutine
@@ -182,12 +182,12 @@ def test_write_choose_level(hass):
@asyncio.coroutine
-def test_unknown_path(hass, test_client):
+def test_unknown_path(hass, aiohttp_client):
"""Test error logged from unknown path."""
_LOGGER.findCaller = MagicMock(
return_value=('unknown_path', 0, None, None))
_LOGGER.error('error message')
- log = (yield from get_error_log(hass, test_client, 1))[0]
+ log = (yield from get_error_log(hass, aiohttp_client, 1))[0]
assert log['source'] == 'unknown_path'
@@ -207,30 +207,30 @@ def log_error_from_test_path(path):
@asyncio.coroutine
-def test_homeassistant_path(hass, test_client):
+def test_homeassistant_path(hass, aiohttp_client):
"""Test error logged from homeassistant path."""
with patch('homeassistant.components.system_log.HOMEASSISTANT_PATH',
new=['venv_path/homeassistant']):
log_error_from_test_path(
'venv_path/homeassistant/component/component.py')
- log = (yield from get_error_log(hass, test_client, 1))[0]
+ log = (yield from get_error_log(hass, aiohttp_client, 1))[0]
assert log['source'] == 'component/component.py'
@asyncio.coroutine
-def test_config_path(hass, test_client):
+def test_config_path(hass, aiohttp_client):
"""Test error logged from config path."""
with patch.object(hass.config, 'config_dir', new='config'):
log_error_from_test_path('config/custom_component/test.py')
- log = (yield from get_error_log(hass, test_client, 1))[0]
+ log = (yield from get_error_log(hass, aiohttp_client, 1))[0]
assert log['source'] == 'custom_component/test.py'
@asyncio.coroutine
-def test_netdisco_path(hass, test_client):
+def test_netdisco_path(hass, aiohttp_client):
"""Test error logged from netdisco path."""
with patch.dict('sys.modules',
netdisco=MagicMock(__path__=['venv_path/netdisco'])):
log_error_from_test_path('venv_path/netdisco/disco_component.py')
- log = (yield from get_error_log(hass, test_client, 1))[0]
+ log = (yield from get_error_log(hass, aiohttp_client, 1))[0]
assert log['source'] == 'disco_component.py'
diff --git a/tests/components/test_websocket_api.py b/tests/components/test_websocket_api.py
index d0c129e512e45452779a2ceff67e3a6146b6cef2..4deccf65209fa32b4bc785c0bcdc9e3733c199d7 100644
--- a/tests/components/test_websocket_api.py
+++ b/tests/components/test_websocket_api.py
@@ -16,12 +16,12 @@ API_PASSWORD = 'test1234'
@pytest.fixture
-def websocket_client(loop, hass, test_client):
+def websocket_client(loop, hass, aiohttp_client):
"""Websocket client fixture connected to websocket server."""
assert loop.run_until_complete(
async_setup_component(hass, 'websocket_api'))
- client = loop.run_until_complete(test_client(hass.http.app))
+ client = loop.run_until_complete(aiohttp_client(hass.http.app))
ws = loop.run_until_complete(client.ws_connect(wapi.URL))
auth_ok = loop.run_until_complete(ws.receive_json())
assert auth_ok['type'] == wapi.TYPE_AUTH_OK
@@ -33,7 +33,7 @@ def websocket_client(loop, hass, test_client):
@pytest.fixture
-def no_auth_websocket_client(hass, loop, test_client):
+def no_auth_websocket_client(hass, loop, aiohttp_client):
"""Websocket connection that requires authentication."""
assert loop.run_until_complete(
async_setup_component(hass, 'websocket_api', {
@@ -42,7 +42,7 @@ def no_auth_websocket_client(hass, loop, test_client):
}
}))
- client = loop.run_until_complete(test_client(hass.http.app))
+ client = loop.run_until_complete(aiohttp_client(hass.http.app))
ws = loop.run_until_complete(client.ws_connect(wapi.URL))
auth_ok = loop.run_until_complete(ws.receive_json())
diff --git a/tests/helpers/test_aiohttp_client.py b/tests/helpers/test_aiohttp_client.py
index abe30d80a497fb3e3079a5cb8f9f383d955f148e..28bb31c848204d34d11db68c194ba12acab681b6 100644
--- a/tests/helpers/test_aiohttp_client.py
+++ b/tests/helpers/test_aiohttp_client.py
@@ -14,7 +14,7 @@ from tests.common import get_test_home_assistant
@pytest.fixture
-def camera_client(hass, test_client):
+def camera_client(hass, aiohttp_client):
"""Fixture to fetch camera streams."""
assert hass.loop.run_until_complete(async_setup_component(hass, 'camera', {
'camera': {
@@ -23,7 +23,7 @@ def camera_client(hass, test_client):
'mjpeg_url': 'http://example.com/mjpeg_stream',
}}))
- yield hass.loop.run_until_complete(test_client(hass.http.app))
+ yield hass.loop.run_until_complete(aiohttp_client(hass.http.app))
class TestHelpersAiohttpClient(unittest.TestCase):
diff --git a/tests/test_util/aiohttp.py b/tests/test_util/aiohttp.py
index d661ffba477bc16454c434141b476260926b978d..e67d5de50d1bccfa375952417799b5744fd359fb 100644
--- a/tests/test_util/aiohttp.py
+++ b/tests/test_util/aiohttp.py
@@ -82,7 +82,8 @@ class AiohttpClientMocker:
def create_session(self, loop):
"""Create a ClientSession that is bound to this mocker."""
session = ClientSession(loop=loop)
- session._request = self.match_request
+ # Setting directly on `session` will raise deprecation warning
+ object.__setattr__(session, '_request', self.match_request)
return session
async def match_request(self, method, url, *, data=None, auth=None,