Fix tests: close all resources before closing the loop

aio-libs · May 2, 2015 · 24a8b97 · 24a8b97
1 parent 4895dd5
commit 24a8b97
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/tests/test_cookie_storage.py b/tests/test_cookie_storage.py
@@ -13,8 +13,12 @@ class TestSimleCookieStorage(unittest.TestCase):
     def setUp(self):
         self.loop = asyncio.new_event_loop()
         asyncio.set_event_loop(None)
+        self.srv = None
+        self.handler = None
 
     def tearDown(self):
+        self.loop.run_until_complete(self.handler.finish_connections())
+        self.srv.close()
         self.loop.close()
 
     def find_unused_port(self):
@@ -32,10 +36,12 @@ def create_server(self, method, path, handler=None):
             app.router.add_route(method, path, handler)
 
         port = self.find_unused_port()
+        handler = app.make_handler()
         srv = yield from self.loop.create_server(
-            app.make_handler(), '127.0.0.1', port)
+            handler, '127.0.0.1', port)
         url = "http://127.0.0.1:{}".format(port) + path
-        self.addCleanup(srv.close)
+        self.handler = handler
+        self.srv = srv
         return app, srv, url
 
     def make_cookie(self, data):
@@ -123,8 +129,8 @@ def go():
                 loop=self.loop)
             self.assertEqual(200, resp.status)
             self.assertEqual(
-                'Set-Cookie: AIOHTTP_SESSION="{}"; httponly; Path=/',
-                resp.cookies['AIOHTTP_SESSION'].output())
+                'Set-Cookie: AIOHTTP_SESSION="{}"; httponly; Path=/'.upper(),
+                resp.cookies['AIOHTTP_SESSION'].output().upper())
 
         self.loop.run_until_complete(go())
 

diff --git a/tests/test_encrypted_cookie_storage.py b/tests/test_encrypted_cookie_storage.py
@@ -18,8 +18,13 @@ def setUp(self):
         self.loop = asyncio.new_event_loop()
         asyncio.set_event_loop(None)
         self.key = b'Sixteen byte key'
-
+        self.handler = None
+        self.srv = None
     def tearDown(self):
+        if self.handler is not None:
+            self.loop.run_until_complete(self.handler.finish_connections())
+        if self.srv is not None:
+            self.srv.close()
         self.loop.close()
 
     def find_unused_port(self):
@@ -38,10 +43,12 @@ def create_server(self, method, path, handler=None):
             app.router.add_route(method, path, handler)
 
         port = self.find_unused_port()
+        handler = app.make_handler()
         srv = yield from self.loop.create_server(
-            app.make_handler(), '127.0.0.1', port)
+            handler, '127.0.0.1', port)
         url = "http://127.0.0.1:{}".format(port) + path
-        self.addCleanup(srv.close)
+        self.srv = srv
+        self.handler = handler
         return app, srv, url
 
     def make_cookie(self, data):

diff --git a/tests/test_redis_storage.py b/tests/test_redis_storage.py
@@ -15,8 +15,14 @@ class TestRedisStorage(unittest.TestCase):
     def setUp(self):
         self.loop = asyncio.new_event_loop()
         asyncio.set_event_loop(None)
+        self.handler = None
+        self.srv = None
 
     def tearDown(self):
+        if self.handler is not None:
+            self.loop.run_until_complete(self.handler.finish_connections())
+        if self.srv is not None:
+            self.srv.close()
         self.loop.close()
 
     def find_unused_port(self):
@@ -40,10 +46,12 @@ def create_server(self, method, path, handler=None, max_age=None):
             app.router.add_route(method, path, handler)
 
         port = self.find_unused_port()
+        handler = app.make_handler()
         srv = yield from self.loop.create_server(
-            app.make_handler(), '127.0.0.1', port)
+            handler, '127.0.0.1', port)
         url = "http://127.0.0.1:{}".format(port) + path
-        self.addCleanup(srv.close)
+        self.srv = srv
+        self.handler = handler
         return app, srv, url
 
     @asyncio.coroutine