Fix #172: Set server.transport to None on .closing()

Author: asvetlov

CHANGES.txt

@@ -16,6 +16,8 @@ CHANGES
 
 - Drop closed connections from connector #173
 
+- Set server.transport to None on .closing() #172
+
 0.9.3 (10-30-2014)
 ------------------
 

aiohttp/server.py

@@ -102,6 +102,7 @@ def closing(self):
         if ((not self._reading_request or self._request_handler is None) and
                 self.transport is not None):
             self.transport.close()
+            self.transport = None
 
     def connection_made(self, transport):
         super().connection_made(transport)

tests/test_http_server.py

@@ -48,11 +48,38 @@ def test_closing(self):
         srv._keep_alive_handle = keep_alive_handle
         timeout_handle = unittest.mock.Mock()
         srv._timeout_handle = timeout_handle
-        srv.transport = unittest.mock.Mock()
+        transport = srv.transport = unittest.mock.Mock()
         srv.writer = unittest.mock.Mock()
 
         srv.closing()
-        self.assertTrue(srv.transport.close.called)
+        self.assertTrue(transport.close.called)
+        self.assertIsNone(srv.transport)
+
+        self.assertIsNotNone(srv._keep_alive_handle)
+        self.assertFalse(keep_alive_handle.cancel.called)
+
+        self.assertIsNotNone(srv._timeout_handle)
+        self.assertFalse(timeout_handle.cancel.called)
+
+    def test_double_closing(self):
+        srv = server.ServerHttpProtocol(loop=self.loop)
+        srv._keep_alive = True
+
+        keep_alive_handle = unittest.mock.Mock()
+        srv._keep_alive_handle = keep_alive_handle
+        timeout_handle = unittest.mock.Mock()
+        srv._timeout_handle = timeout_handle
+        transport = srv.transport = unittest.mock.Mock()
+        srv.writer = unittest.mock.Mock()
+
+        srv.closing()
+        self.assertTrue(transport.close.called)
+        self.assertIsNone(srv.transport)
+
+        transport.reset_mock()
+        srv.closing()
+        self.assertFalse(transport.close.called)
+        self.assertIsNone(srv.transport)
 
         self.assertIsNotNone(srv._keep_alive_handle)
         self.assertFalse(keep_alive_handle.cancel.called)