Make sure file object is close if socket.create_connection fails (GH-11334) (GH-11351)

miss-islington · pablogsal · ned-deily · commit dc020cc9800a · 2019-01-17T20:02:43.000-05:00
The problem affects _testWithTimeoutTriggeredSend in test_socket.py. (cherry picked from commit 1f511e1) Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
@@ -5363,11 +5363,10 @@ def testWithTimeout(self):
 
     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()
