Fix test server finalization procedure

aio-libs · Jun 4, 2016 · f180199 · f180199
1 parent 3347cdc
commit f180199
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/aiohttp/test_utils.py b/aiohttp/test_utils.py
@@ -417,10 +417,11 @@ def close(self):
         if not self._closed:
             loop = self._loop
             loop.run_until_complete(self._session.close())
-            loop.run_until_complete(self._handler.finish_connections())
-            loop.run_until_complete(self.app.finish())
             self._server.close()
             loop.run_until_complete(self._server.wait_closed())
+            loop.run_until_complete(self.app.shutdown())
+            loop.run_until_complete(self._handler.finish_connections())
+            loop.run_until_complete(self.app.cleanup())
             self._closed = True
 
     def __del__(self):