]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Make sure file object is close if socket.create_connection fails (GH-11334)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Sat, 29 Dec 2018 02:12:39 +0000 (18:12 -0800)
committerGitHub <noreply@github.com>
Sat, 29 Dec 2018 02:12:39 +0000 (18:12 -0800)
The problem affects _testWithTimeoutTriggeredSend in test_socket.py.
(cherry picked from commit 1f511e1af060e98fb789319a96076c06e7f98135)

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

index 9b9d11368cb7f64e1c0b216f0027080fdc2d1ce7..82b89fcbafa60075437c96973a7e4cf7ba834e87 100644 (file)
@@ -5717,11 +5717,10 @@ class SendfileUsingSendTest(ThreadedTCPSocketTest):
 
     def _testWithTimeoutTriggeredSend(self):
         address = self.serv.getsockname()
-        file = open(support.TESTFN, 'rb')
-        with socket.create_connection(address, timeout=0.01) as sock, \
-                file as file:
-            meth = self.meth_from_sock(sock)
-            self.assertRaises(socket.timeout, meth, file)
+        with open(support.TESTFN, 'rb') as file:
+            with socket.create_connection(address, timeout=0.01) as sock:
+                meth = self.meth_from_sock(sock)
+                self.assertRaises(socket.timeout, meth, file)
 
     def testWithTimeoutTriggeredSend(self):
         conn = self.accept_conn()