Fix api incompatibility with aiohttp 2.3.0

Further reading: aiohttp: Drop deprecated RequestHandler.finish_connections #2006 aio-libs/aiohttp#2006 Signed-off-by: Florian Scherf <[email protected]>
pengutronix · Oct 19, 2017 · 350b86f · 350b86f
1 parent 2a253be
commit 350b86f
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/aiohttp_json_rpc/pytest.py b/aiohttp_json_rpc/pytest.py
@@ -84,11 +84,17 @@ def gen_rpc_context(loop, host, port, rpc, rpc_route, routes=(),
     loop.run_until_complete(rpc_context.finish_connections())
 
     # teardown server
-    server.close()
-    loop.run_until_complete(server.wait_closed())
-    loop.run_until_complete(app.shutdown())
-    loop.run_until_complete(handler.finish_connections(1))
-    loop.run_until_complete(app.cleanup())
+    async def teardown_server():
+        try:
+            server.close()
+            await server.wait_closed()
+            await app.shutdown()
+            await handler.shutdown(60.0)
+
+        finally:
+            await app.cleanup()
+
+    loop.run_until_complete(teardown_server())
 
 
 @pytest.yield_fixture