From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 21 May 2018 12:30:06 +0000 (-0700)
Subject: Use IPv4 only to avoid IP address collision (GH-7030)
X-Git-Tag: v3.7.0b5~67
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=316f86911a369a1c8f6f3a94620f1bdecefe59b2;p=thirdparty%2FPython%2Fcpython.git

Use IPv4 only to avoid IP address collision (GH-7030)

(cherry picked from commit b7555babe95ee0db2f1224ec53cfe68a005448a1)

Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>
---

diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
index a14c55693539..8566a9d5504f 100644
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -1848,15 +1848,13 @@ class BaseLoopSockSendfileTests(test_utils.TestCase):
     def prepare(self):
         sock = self.make_socket()
         proto = self.MyProto(self.loop)
-        af = socket.AF_UNSPEC if support.IPV6_ENABLED else socket.AF_INET
         server = self.run_loop(self.loop.create_server(
-            lambda: proto, support.HOST, 0, family=af))
-        port = server.sockets[0].getsockname()[1]
+            lambda: proto, support.HOST, 0, family=socket.AF_INET))
+        addr = server.sockets[0].getsockname()
 
         for _ in range(10):
             try:
-                self.run_loop(self.loop.sock_connect(sock,
-                                                     (support.HOST, port)))
+                self.run_loop(self.loop.sock_connect(sock, addr))
             except OSError:
                 self.run_loop(asyncio.sleep(0.5))
                 continue
@@ -1864,7 +1862,7 @@ class BaseLoopSockSendfileTests(test_utils.TestCase):
                 break
         else:
             # One last try, so we get the exception
-            self.run_loop(self.loop.sock_connect(sock, (support.HOST, port)))
+            self.run_loop(self.loop.sock_connect(sock, addr))
 
         def cleanup():
             server.close()