From 3a4db2fae7733025f6b52f4fc5acb77676cec1d7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 2 Jan 2020 00:13:04 +0100 Subject: [PATCH] Migrate mailbox tests from coroutine to async/await (#30361) --- tests/components/mailbox/test_init.py | 51 +++++++++++---------------- 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/tests/components/mailbox/test_init.py b/tests/components/mailbox/test_init.py index ec398be0d4ae..258e0cc7ebfe 100644 --- a/tests/components/mailbox/test_init.py +++ b/tests/components/mailbox/test_init.py @@ -1,5 +1,4 @@ """The tests for the mailbox component.""" -import asyncio from hashlib import sha1 import pytest @@ -16,44 +15,40 @@ def mock_http_client(hass, hass_client): return hass.loop.run_until_complete(hass_client()) -@asyncio.coroutine -def test_get_platforms_from_mailbox(mock_http_client): +async def test_get_platforms_from_mailbox(mock_http_client): """Get platforms from mailbox.""" url = "/api/mailbox/platforms" - req = yield from mock_http_client.get(url) + req = await mock_http_client.get(url) assert req.status == 200 - result = yield from req.json() + result = await req.json() assert len(result) == 1 and "DemoMailbox" == result[0].get("name", None) -@asyncio.coroutine -def test_get_messages_from_mailbox(mock_http_client): +async def test_get_messages_from_mailbox(mock_http_client): """Get messages from mailbox.""" url = "/api/mailbox/messages/DemoMailbox" - req = yield from mock_http_client.get(url) + req = await mock_http_client.get(url) assert req.status == 200 - result = yield from req.json() + result = await req.json() assert len(result) == 10 -@asyncio.coroutine -def test_get_media_from_mailbox(mock_http_client): +async def test_get_media_from_mailbox(mock_http_client): """Get audio from mailbox.""" mp3sha = "3f67c4ea33b37d1710f772a26dd3fb43bb159d50" msgtxt = "Message 1. " "Lorem ipsum dolor sit amet, consectetur adipiscing elit. " msgsha = sha1(msgtxt.encode("utf-8")).hexdigest() url = "/api/mailbox/media/DemoMailbox/%s" % (msgsha) - req = yield from mock_http_client.get(url) + req = await mock_http_client.get(url) assert req.status == 200 - data = yield from req.read() + data = await req.read() assert sha1(data).hexdigest() == mp3sha -@asyncio.coroutine -def test_delete_from_mailbox(mock_http_client): +async def test_delete_from_mailbox(mock_http_client): """Get audio from mailbox.""" msgtxt1 = "Message 1. " "Lorem ipsum dolor sit amet, consectetur adipiscing elit. " msgtxt2 = "Message 3. " "Lorem ipsum dolor sit amet, consectetur adipiscing elit. " @@ -62,50 +57,46 @@ def test_delete_from_mailbox(mock_http_client): for msg in [msgsha1, msgsha2]: url = "/api/mailbox/delete/DemoMailbox/%s" % (msg) - req = yield from mock_http_client.delete(url) + req = await mock_http_client.delete(url) assert req.status == 200 url = "/api/mailbox/messages/DemoMailbox" - req = yield from mock_http_client.get(url) + req = await mock_http_client.get(url) assert req.status == 200 - result = yield from req.json() + result = await req.json() assert len(result) == 8 -@asyncio.coroutine -def test_get_messages_from_invalid_mailbox(mock_http_client): +async def test_get_messages_from_invalid_mailbox(mock_http_client): """Get messages from mailbox.""" url = "/api/mailbox/messages/mailbox.invalid_mailbox" - req = yield from mock_http_client.get(url) + req = await mock_http_client.get(url) assert req.status == 404 -@asyncio.coroutine -def test_get_media_from_invalid_mailbox(mock_http_client): +async def test_get_media_from_invalid_mailbox(mock_http_client): """Get messages from mailbox.""" msgsha = "0000000000000000000000000000000000000000" url = "/api/mailbox/media/mailbox.invalid_mailbox/%s" % (msgsha) - req = yield from mock_http_client.get(url) + req = await mock_http_client.get(url) assert req.status == 404 -@asyncio.coroutine -def test_get_media_from_invalid_msgid(mock_http_client): +async def test_get_media_from_invalid_msgid(mock_http_client): """Get messages from mailbox.""" msgsha = "0000000000000000000000000000000000000000" url = "/api/mailbox/media/DemoMailbox/%s" % (msgsha) - req = yield from mock_http_client.get(url) + req = await mock_http_client.get(url) assert req.status == 500 -@asyncio.coroutine -def test_delete_from_invalid_mailbox(mock_http_client): +async def test_delete_from_invalid_mailbox(mock_http_client): """Get audio from mailbox.""" msgsha = "0000000000000000000000000000000000000000" url = "/api/mailbox/delete/mailbox.invalid_mailbox/%s" % (msgsha) - req = yield from mock_http_client.delete(url) + req = await mock_http_client.delete(url) assert req.status == 404