Restore test run on uvloop

aio-libs · Jan 18, 2018 · d035426 · d035426
1 parent 79655eb
commit d035426
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 24 deletions.
diff --git a/pytest.ini b/pytest.ini
@@ -1,3 +1,4 @@
 [pytest]
+addopts= --loop=all
 filterwarnings=
     error
diff --git a/tests/test_client_session.py b/tests/test_client_session.py
@@ -468,30 +468,30 @@ async def test_request_tracing(loop):
     trace_config.on_request_end.append(on_request_end)
     trace_config.on_request_redirect.append(on_request_redirect)
 
-    session = aiohttp.ClientSession(loop=loop, trace_configs=[trace_config])
-
-    resp = await session.get(
-        'http://example.com',
-        trace_request_ctx=trace_request_ctx
-    )
-
-    on_request_start.assert_called_once_with(
-        session,
-        trace_config_ctx,
-        hdrs.METH_GET,
-        URL("http://example.com"),
-        CIMultiDict()
-    )
-
-    on_request_end.assert_called_once_with(
-        session,
-        trace_config_ctx,
-        hdrs.METH_GET,
-        URL("http://example.com"),
-        CIMultiDict(),
-        resp
-    )
-    assert not on_request_redirect.called
+    async with aiohttp.ClientSession(loop=loop,
+                                     trace_configs=[trace_config]) as session:
+
+        async with await session.get(
+                'http://example.com',
+                trace_request_ctx=trace_request_ctx) as resp:
+
+            on_request_start.assert_called_once_with(
+                session,
+                trace_config_ctx,
+                hdrs.METH_GET,
+                URL("http://example.com"),
+                CIMultiDict()
+            )
+
+            on_request_end.assert_called_once_with(
+                session,
+                trace_config_ctx,
+                hdrs.METH_GET,
+                URL("http://example.com"),
+                CIMultiDict(),
+                resp
+            )
+            assert not on_request_redirect.called
 
 
 async def test_request_tracing_exception(loop):