Issue #36: Ingnore CancelledError in transport.connect

Author: 1st1

tests/test_tcp.py

@@ -1,6 +1,7 @@
 import asyncio
+import logging
 import socket
-import unittest
+import unittest.mock
 import uvloop
 import sys
 
@@ -499,6 +500,23 @@ async def start_server():
 
         self.loop.run_until_complete(start_server())
 
+    def test_connect_silent_cancellation(self):
+        logger = logging.getLogger('asyncio')
+
+        srv_sock = socket.socket()
+        with srv_sock, unittest.mock.patch.object(logger, 'error') as log:
+            srv_sock.bind(('127.0.0.1', 0))
+
+            with self.assertRaises(asyncio.TimeoutError):
+                self.loop.run_until_complete(
+                    asyncio.wait_for(self.loop.create_connection(
+                        asyncio.Protocol, *srv_sock.getsockname()),
+                    loop=self.loop, timeout=0.1))
+
+            self.loop.run_until_complete(asyncio.sleep(0, loop=self.loop))
+
+            log.assert_not_called()
+
 
 class Test_UV_TCP(_TestTCP, tb.UVTestCase):
 

uvloop/handles/stream.pyx

@@ -608,7 +608,13 @@ cdef class UVStream(UVBaseTransport):
         if exc is None:
             self._init_protocol()
         else:
-            if self._waiter is None or self._waiter.done():
+            if self._waiter is None:
+                self._fatal_error(exc, False, "connect failed")
+            elif self._waiter.cancelled():
+                # Connect call was cancelled; just close the transport
+                # silently.
+                self._close()
+            elif self._waiter.done():
                 self._fatal_error(exc, False, "connect failed")
             else:
                 self._waiter.set_exception(exc)