Drop closed connection from connector

Author: asvetlov

aiohttp/connector.py

@@ -35,7 +35,9 @@ def loop(self):
 
     def close(self):
         if self._transport is not None:
-            self._transport.close()
+            self._connector._release(
+                self._key, self._request, self._transport, self._protocol,
+                should_close=True)
             self._transport = None
             self._wr = None
 
@@ -173,21 +175,22 @@ def _get(self, key):
 
         return None, None
 
-    def _release(self, key, req, transport, protocol):
+    def _release(self, key, req, transport, protocol, *, should_close=False):
         resp = req.response
-        should_close = False
 
-        if resp is not None:
-            if resp.message is None:
-                should_close = True
-            else:
-                should_close = resp.message.should_close
+        if not should_close:
+            if resp is not None:
+                if resp.message is None:
+                    should_close = True
+                else:
+                    should_close = resp.message.should_close
 
-        if self._force_close:
-            should_close = True
+            if self._force_close:
+                should_close = True
 
         reader = protocol.reader
         if should_close or (reader.output and not reader.output.at_eof()):
+            self._conns.pop(key, None)
             transport.close()
         else:
             conns = self._conns.get(key)

tests/test_connector.py

@@ -39,8 +39,10 @@ def test_close(self):
             self.connector, self.key, self.request,
             self.transport, self.protocol, self.loop)
         conn.close()
-        self.assertTrue(self.transport.close.called)
         self.assertIsNone(conn._transport)
+        self.connector._release.assert_called_with(
+            self.key, self.request, self.transport, self.protocol,
+            should_close=True)
 
     def test_release(self):
         conn = Connection(