]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-35602: Make sure the transport is always closed in SelectorEventLoopUnixSockSendf...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Sat, 29 Dec 2018 19:38:24 +0000 (11:38 -0800)
committerGitHub <noreply@github.com>
Sat, 29 Dec 2018 19:38:24 +0000 (11:38 -0800)
There is a race condition in SelectorEventLoopUnixSockSendfileTests that causes the prepare() method return a non connected server protocol, making the cleanup() method skips the correct handling of the transport. This commit makes prepare() always return a connected server protocol that can always be cleaned up correctly.
(cherry picked from commit d51324a2f5d172665f8824b25456c9822797fc84)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
Lib/test/test_asyncio/test_unix_events.py

index 104f995937972e60672029919547aa77a8a22b35..5d16b95456f0cb7ec3f44dba22504290ccf02d8a 100644 (file)
@@ -433,10 +433,12 @@ class SelectorEventLoopUnixSockSendfileTests(test_utils.TestCase):
             self.data = bytearray()
             self.fut = loop.create_future()
             self.transport = None
+            self._ready = loop.create_future()
 
         def connection_made(self, transport):
             self.started = True
             self.transport = transport
+            self._ready.set_result(None)
 
         def data_received(self, data):
             self.data.extend(data)
@@ -487,13 +489,11 @@ class SelectorEventLoopUnixSockSendfileTests(test_utils.TestCase):
         server = self.run_loop(self.loop.create_server(
             lambda: proto, sock=srv_sock))
         self.run_loop(self.loop.sock_connect(sock, (support.HOST, port)))
+        self.run_loop(proto._ready)
 
         def cleanup():
-            if proto.transport is not None:
-                # can be None if the task was cancelled before
-                # connection_made callback
-                proto.transport.close()
-                self.run_loop(proto.wait_closed())
+            proto.transport.close()
+            self.run_loop(proto.wait_closed())
 
             server.close()
             self.run_loop(server.wait_closed())