From 24b52b963dc9724c1e5080970538c6936fc7af52 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Fri, 23 Oct 2020 06:41:06 -1000 Subject: [PATCH 1/4] Upgrade to aiohttp 3.7.0 --- homeassistant/package_constraints.txt | 2 +- requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt index ca86d99eb305a..dc3e3984b12c6 100644 --- a/homeassistant/package_constraints.txt +++ b/homeassistant/package_constraints.txt @@ -1,6 +1,6 @@ PyJWT==1.7.1 PyNaCl==1.3.0 -aiohttp==3.6.2 +aiohttp==3.7.0 aiohttp_cors==0.7.0 astral==1.10.1 async_timeout==3.0.1 diff --git a/requirements.txt b/requirements.txt index 5bee6b7f94445..9dff421a4602b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -c homeassistant/package_constraints.txt # Home Assistant Core -aiohttp==3.6.2 +aiohttp==3.7.0 astral==1.10.1 async_timeout==3.0.1 attrs==19.3.0 diff --git a/setup.py b/setup.py index 490a7da56b86a..9333bfc1b5094 100755 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ PACKAGES = find_packages(exclude=["tests", "tests.*"]) REQUIRES = [ - "aiohttp==3.6.2", + "aiohttp==3.7.0", "astral==1.10.1", "async_timeout==3.0.1", "attrs==19.3.0", From 774a7e2ae49a7d6810934fd6320832dab81e013c Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sat, 24 Oct 2020 10:31:19 -1000 Subject: [PATCH 2/4] bump to 3.7.1 --- homeassistant/package_constraints.txt | 2 +- requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt index dc3e3984b12c6..7f1793f605eaa 100644 --- a/homeassistant/package_constraints.txt +++ b/homeassistant/package_constraints.txt @@ -1,6 +1,6 @@ PyJWT==1.7.1 PyNaCl==1.3.0 -aiohttp==3.7.0 +aiohttp==3.7.1 aiohttp_cors==0.7.0 astral==1.10.1 async_timeout==3.0.1 diff --git a/requirements.txt b/requirements.txt index 9dff421a4602b..d5c0d1ebd28a2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -c homeassistant/package_constraints.txt # Home Assistant Core -aiohttp==3.7.0 +aiohttp==3.7.1 astral==1.10.1 async_timeout==3.0.1 attrs==19.3.0 diff --git a/setup.py b/setup.py index 9333bfc1b5094..fa488b5ed8fb1 100755 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ PACKAGES = find_packages(exclude=["tests", "tests.*"]) REQUIRES = [ - "aiohttp==3.7.0", + "aiohttp==3.7.1", "astral==1.10.1", "async_timeout==3.0.1", "attrs==19.3.0", From 9d02558d6fad6dddbe4f4588b2da2f451a49da27 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sun, 25 Oct 2020 02:38:20 -1000 Subject: [PATCH 3/4] missing block till done --- tests/components/webhook/test_trigger.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/components/webhook/test_trigger.py b/tests/components/webhook/test_trigger.py index 30601ef6bec1d..d0b2ddd7a6ed5 100644 --- a/tests/components/webhook/test_trigger.py +++ b/tests/components/webhook/test_trigger.py @@ -38,6 +38,7 @@ def store_event(event): } }, ) + await hass.async_block_till_done() client = await aiohttp_client(hass.http.app) @@ -71,6 +72,7 @@ def store_event(event): } }, ) + await hass.async_block_till_done() client = await aiohttp_client(hass.http.app) @@ -104,6 +106,7 @@ def store_event(event): } }, ) + await hass.async_block_till_done() client = await aiohttp_client(hass.http.app) @@ -137,6 +140,7 @@ def store_event(event): } }, ) + await hass.async_block_till_done() client = await aiohttp_client(hass.http.app) @@ -163,6 +167,7 @@ def store_event(event): "reload", blocking=True, ) + await hass.async_block_till_done() await client.post("/api/webhook/post_webhook", data={"hello": "world"}) From 6801087977f44e44b39bd7bf46045e122f386be1 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sun, 25 Oct 2020 02:51:31 -1000 Subject: [PATCH 4/4] and a few more --- tests/components/webhook/test_trigger.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/components/webhook/test_trigger.py b/tests/components/webhook/test_trigger.py index d0b2ddd7a6ed5..bb3cb6807434c 100644 --- a/tests/components/webhook/test_trigger.py +++ b/tests/components/webhook/test_trigger.py @@ -12,6 +12,7 @@ async def setup_http(hass): """Set up http.""" assert await async_setup_component(hass, "http", {}) assert await async_setup_component(hass, "webhook", {}) + await hass.async_block_till_done() async def test_webhook_json(hass, aiohttp_client): @@ -43,6 +44,7 @@ def store_event(event): client = await aiohttp_client(hass.http.app) await client.post("/api/webhook/json_webhook", json={"hello": "world"}) + await hass.async_block_till_done() assert len(events) == 1 assert events[0].data["hello"] == "yo world" @@ -77,6 +79,7 @@ def store_event(event): client = await aiohttp_client(hass.http.app) await client.post("/api/webhook/post_webhook", data={"hello": "world"}) + await hass.async_block_till_done() assert len(events) == 1 assert events[0].data["hello"] == "yo world" @@ -111,6 +114,7 @@ def store_event(event): client = await aiohttp_client(hass.http.app) await client.post("/api/webhook/query_webhook?hello=world") + await hass.async_block_till_done() assert len(events) == 1 assert events[0].data["hello"] == "yo world" @@ -145,6 +149,7 @@ def store_event(event): client = await aiohttp_client(hass.http.app) await client.post("/api/webhook/post_webhook", data={"hello": "world"}) + await hass.async_block_till_done() assert len(events) == 1 assert events[0].data["hello"] == "yo world" @@ -170,6 +175,7 @@ def store_event(event): await hass.async_block_till_done() await client.post("/api/webhook/post_webhook", data={"hello": "world"}) + await hass.async_block_till_done() assert len(events) == 2 assert events[1].data["hello"] == "yo2 world"