Commit 78254dc6 authored by Antoine Pitrou's avatar Antoine Pitrou

Issue #18792: Use "127.0.0.1" or "::1" instead of "localhost" as much as...

Issue #18792: Use "127.0.0.1" or "::1" instead of "localhost" as much as possible, since "localhost" goes through a DNS lookup under recent Windows versions.
parent 4203570d
...@@ -10,7 +10,7 @@ import errno ...@@ -10,7 +10,7 @@ import errno
import struct import struct
from test import test_support from test import test_support
from test.test_support import TESTFN, run_unittest, unlink from test.test_support import TESTFN, run_unittest, unlink, HOST
from StringIO import StringIO from StringIO import StringIO
try: try:
...@@ -18,7 +18,6 @@ try: ...@@ -18,7 +18,6 @@ try:
except ImportError: except ImportError:
threading = None threading = None
HOST = test_support.HOST
class dummysocket: class dummysocket:
def __init__(self): def __init__(self):
......
...@@ -17,7 +17,7 @@ except ImportError: ...@@ -17,7 +17,7 @@ except ImportError:
from unittest import TestCase from unittest import TestCase
from test import test_support from test import test_support
from test.test_support import HOST from test.test_support import HOST, HOSTv6
threading = test_support.import_module('threading') threading = test_support.import_module('threading')
...@@ -562,7 +562,7 @@ class TestFTPClass(TestCase): ...@@ -562,7 +562,7 @@ class TestFTPClass(TestCase):
class TestIPv6Environment(TestCase): class TestIPv6Environment(TestCase):
def setUp(self): def setUp(self):
self.server = DummyFTPServer((HOST, 0), af=socket.AF_INET6) self.server = DummyFTPServer((HOSTv6, 0), af=socket.AF_INET6)
self.server.start() self.server.start()
self.client = ftplib.FTP() self.client = ftplib.FTP()
self.client.connect(self.server.host, self.server.port) self.client.connect(self.server.host, self.server.port)
...@@ -713,7 +713,7 @@ class TestTimeouts(TestCase): ...@@ -713,7 +713,7 @@ class TestTimeouts(TestCase):
self.assertTrue(socket.getdefaulttimeout() is None) self.assertTrue(socket.getdefaulttimeout() is None)
socket.setdefaulttimeout(30) socket.setdefaulttimeout(30)
try: try:
ftp = ftplib.FTP("localhost") ftp = ftplib.FTP(HOST)
finally: finally:
socket.setdefaulttimeout(None) socket.setdefaulttimeout(None)
self.assertEqual(ftp.sock.gettimeout(), 30) self.assertEqual(ftp.sock.gettimeout(), 30)
...@@ -725,7 +725,7 @@ class TestTimeouts(TestCase): ...@@ -725,7 +725,7 @@ class TestTimeouts(TestCase):
self.assertTrue(socket.getdefaulttimeout() is None) self.assertTrue(socket.getdefaulttimeout() is None)
socket.setdefaulttimeout(30) socket.setdefaulttimeout(30)
try: try:
ftp = ftplib.FTP("localhost", timeout=None) ftp = ftplib.FTP(HOST, timeout=None)
finally: finally:
socket.setdefaulttimeout(None) socket.setdefaulttimeout(None)
self.assertTrue(ftp.sock.gettimeout() is None) self.assertTrue(ftp.sock.gettimeout() is None)
......
...@@ -1385,7 +1385,7 @@ class _TestRemoteManager(BaseTestCase): ...@@ -1385,7 +1385,7 @@ class _TestRemoteManager(BaseTestCase):
authkey = os.urandom(32) authkey = os.urandom(32)
manager = QueueManager( manager = QueueManager(
address=('localhost', 0), authkey=authkey, serializer=SERIALIZER address=(test.test_support.HOST, 0), authkey=authkey, serializer=SERIALIZER
) )
manager.start() manager.start()
...@@ -1423,7 +1423,7 @@ class _TestManagerRestart(BaseTestCase): ...@@ -1423,7 +1423,7 @@ class _TestManagerRestart(BaseTestCase):
def test_rapid_restart(self): def test_rapid_restart(self):
authkey = os.urandom(32) authkey = os.urandom(32)
manager = QueueManager( manager = QueueManager(
address=('localhost', 0), authkey=authkey, serializer=SERIALIZER) address=(test.test_support.HOST, 0), authkey=authkey, serializer=SERIALIZER)
srvr = manager.get_server() srvr = manager.get_server()
addr = srvr.address addr = srvr.address
# Close the connection.Listener socket which gets opened as a part # Close the connection.Listener socket which gets opened as a part
......
...@@ -290,7 +290,12 @@ def requires(resource, msg=None): ...@@ -290,7 +290,12 @@ def requires(resource, msg=None):
msg = "Use of the `%s' resource not enabled" % resource msg = "Use of the `%s' resource not enabled" % resource
raise ResourceDenied(msg) raise ResourceDenied(msg)
HOST = 'localhost'
# Don't use "localhost", since resolving it uses the DNS under recent
# Windows versions (see issue #18792).
HOST = "127.0.0.1"
HOSTv6 = "::1"
def find_unused_port(family=socket.AF_INET, socktype=socket.SOCK_STREAM): def find_unused_port(family=socket.AF_INET, socktype=socket.SOCK_STREAM):
"""Returns an unused port that should be suitable for binding. This is """Returns an unused port that should be suitable for binding. This is
......
...@@ -191,6 +191,10 @@ IDLE ...@@ -191,6 +191,10 @@ IDLE
Tests Tests
----- -----
- Issue #18792: Use "127.0.0.1" or "::1" instead of "localhost" as much as
possible, since "localhost" goes through a DNS lookup under recent Windows
versions.
- Issue #18357: add tests for dictview set difference. - Issue #18357: add tests for dictview set difference.
Patch by Fraser Tweedale. Patch by Fraser Tweedale.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment