diff --git a/tests/integration/aiohttp_utils.py b/tests/integration/aiohttp_utils.py index b276973..71b59e8 100644 --- a/tests/integration/aiohttp_utils.py +++ b/tests/integration/aiohttp_utils.py @@ -2,7 +2,6 @@ import asyncio import aiohttp -from aiohttp.test_utils import TestClient async def aiohttp_request(loop, method, url, output="text", encoding="utf-8", content_type=None, **kwargs): diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py new file mode 100644 index 0000000..36010a6 --- /dev/null +++ b/tests/integration/conftest.py @@ -0,0 +1,7 @@ +import pytest + + +@pytest.fixture(params=["https", "http"]) +def scheme(request): + """Fixture that returns both http and https.""" + return request.param diff --git a/tests/integration/test_aiohttp.py b/tests/integration/test_aiohttp.py index 05959da..4a10e06 100644 --- a/tests/integration/test_aiohttp.py +++ b/tests/integration/test_aiohttp.py @@ -34,12 +34,6 @@ def post(url, output="text", **kwargs): return request("POST", url, output="text", **kwargs) -@pytest.fixture(params=["https", "http"]) -def scheme(request): - """Fixture that returns both http and https.""" - return request.param - - def test_status(tmpdir, scheme): url = scheme + "://httpbin.org" with vcr.use_cassette(str(tmpdir.join("status.yaml"))): diff --git a/tests/integration/test_tornado.py b/tests/integration/test_tornado.py index c929829..f0868a1 100644 --- a/tests/integration/test_tornado.py +++ b/tests/integration/test_tornado.py @@ -44,12 +44,6 @@ def post(client, url, data=None, **kwargs): return client.fetch(http.HTTPRequest(url, method="POST", **kwargs)) -@pytest.fixture(params=["https", "http"]) -def scheme(request): - """Fixture that returns both http and https.""" - return request.param - - @pytest.mark.gen_test def test_status_code(get_client, scheme, tmpdir): """Ensure that we can read the status code"""