Use asynctest built-in loop

Author: Ben Picolo

kubernetes_asyncio/config/openid_test.py

@@ -1,3 +1,4 @@
+import asyncio
 import json
 
 import pytest
@@ -36,14 +37,15 @@ def requestor():
     )
 
 
-@pytest.yield_fixture
-def working_client(loop, aiohttp_client):
+def working_client():
+    loop = asyncio.get_running_loop()
+
     app = web.Application()
 
     app.router.add_get('/.well-known/openid-configuration', respond_json({'token_endpoint': '/token'}))
     app.router.add_post('/token', respond_json({'id-token': 'id-token-data', 'refresh-token': 'refresh-token-data'}))
 
-    with patch('kubernetes_asyncio.config.openid.OpenIDRequestor._client_session') as _client_session:
+    with patch('kubernetes_asyncio.config.openid.aiohttp.ClientSession') as _client_session:
         client = TestClient(TestServer(app, loop=loop), loop=loop)
         _client_session.return_value = client
         loop.run_until_complete(client.start_server())
@@ -53,13 +55,13 @@ def working_client(loop, aiohttp_client):
         loop.run_until_complete(client.close())
 
 
-@pytest.yield_fixture
-def fail_well_known_client(loop, aiohttp_client):
+def fail_well_known_client():
+    loop = asyncio.get_running_loop()
     app = web.Application()
 
     app.router.add_get('/.well-known/openid-configuration', make_responder(web.Response(status=500)))
 
-    with patch('kubernetes_asyncio.config.openid.OpenIDRequestor._client_session') as _client_session:
+    with patch('kubernetes_asyncio.config.openid.aiohttp.ClientSession') as _client_session:
         client = TestClient(TestServer(app, loop=loop), loop=loop)
         _client_session.return_value = client
         loop.run_until_complete(client.start_server())
@@ -69,8 +71,8 @@ def fail_well_known_client(loop, aiohttp_client):
         loop.run_until_complete(client.close())
 
 
-@pytest.yield_fixture
-def fail_token_request_client(loop, aiohttp_client):
+def fail_token_request_client():
+    loop = asyncio.get_running_loop()
     app = web.Application()
 
     app.router.add_get('/.well-known/openid-configuration', respond_json({'token_endpoint': '/token'}))
@@ -86,18 +88,21 @@ def fail_token_request_client(loop, aiohttp_client):
         loop.run_until_complete(client.close())
 
 
-async def test_refresh_token_success(requestor, working_client):
-    resp = await requestor.refresh_token('my-refresh-token')
+async def test_refresh_token_success(requestor):
+    with working_client():
+        resp = await requestor.refresh_token('my-refresh-token')
 
-    assert resp['id-token'] == 'id-token-data'
-    assert resp['refresh-token'] == 'refresh-token-data'
+        assert resp['id-token'] == 'id-token-data'
+        assert resp['refresh-token'] == 'refresh-token-data'
 
 
-async def test_failed_well_known(requestor, fail_well_known_client):
-    with pytest.raises(ConfigException):
-        await requestor.refresh_token('my-refresh-token')
+async def test_failed_well_known(requestor):
+    with fail_well_known_client():
+        with pytest.raises(ConfigException):
+            await requestor.refresh_token('my-refresh-token')
 
 
-async def test_failed_refresh_token(requestor, fail_token_request_client):
-    with pytest.raises(ConfigException):
-        await requestor.refresh_token('my-refresh-token')
+async def test_failed_refresh_token(requestor):
+    with fail_token_request_client():
+        with pytest.raises(ConfigException):
+            await requestor.refresh_token('my-refresh-token')

test-requirements.txt

@@ -8,7 +8,6 @@ nose>=1.3.7
 pluggy>=0.3.1
 py>=1.4.31
 pytest
-pytest-aiohttp
 pytest-xdist
 randomize>=0.13
 recommonmark

tox.ini

@@ -9,7 +9,7 @@ deps = -r{toxinidir}/test-requirements.txt
        -r{toxinidir}/requirements.txt
 commands =
    python -V
-   py.test -vvv -s --ignore=kubernetes/e2e_test {posargs}
+   py.test -vvv -s --ignore=kubernetes/e2e_test
 
 [testenv:docs]
 commands =