From 609d8e35befd315df56a73295868785fe7a9f6c6 Mon Sep 17 00:00:00 2001 From: Luiz Menezes Date: Wed, 10 Aug 2016 17:42:13 -0300 Subject: [PATCH] fix test_aiohttp --- tests/integration/test_aiohttp.py | 13 +++++-------- tests/integration/utils.py | 7 +++++++ 2 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 tests/integration/utils.py diff --git a/tests/integration/test_aiohttp.py b/tests/integration/test_aiohttp.py index 1ae2fe1..73bd48d 100644 --- a/tests/integration/test_aiohttp.py +++ b/tests/integration/test_aiohttp.py @@ -1,30 +1,27 @@ import pytest -asyncio = pytest.importorskip("boto3") +aiohttp = pytest.importorskip("aiohttp") import asyncio # NOQA +import sys # NOQA import aiohttp # NOQA import pytest # NOQA import vcr # NOQA - -@asyncio.coroutine -def request(session, method, url, as_text, **kwargs): - response = yield from session.request(method, url, **kwargs) - return response, (yield from response.text()) if as_text else (yield from response.json()) +from .utils import aiohttp_request # NOQA def get(url, as_text=True, **kwargs): loop = asyncio.get_event_loop() with aiohttp.ClientSession() as session: - task = loop.create_task(request(session, 'GET', url, as_text, **kwargs)) + task = loop.create_task(aiohttp_request(session, 'GET', url, as_text, **kwargs)) return loop.run_until_complete(task) def post(url, as_text=True, **kwargs): loop = asyncio.get_event_loop() with aiohttp.ClientSession() as session: - task = loop.create_task(request(session, 'POST', url, as_text, **kwargs)) + task = loop.create_task(aiohttp_request(session, 'POST', url, as_text, **kwargs)) return loop.run_until_complete(task) diff --git a/tests/integration/utils.py b/tests/integration/utils.py new file mode 100644 index 0000000..16731f4 --- /dev/null +++ b/tests/integration/utils.py @@ -0,0 +1,7 @@ +import asyncio + + +@asyncio.coroutine +def aiohttp_request(session, method, url, as_text, **kwargs): + response = yield from session.request(method, url, **kwargs) + return response, (yield from response.text()) if as_text else (yield from response.json())