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.
This commit is contained in:
parent
4203570d01
commit
78254dc6fc
|
@ -10,7 +10,7 @@ import errno
|
|||
import struct
|
||||
|
||||
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
|
||||
|
||||
try:
|
||||
|
@ -18,7 +18,6 @@ try:
|
|||
except ImportError:
|
||||
threading = None
|
||||
|
||||
HOST = test_support.HOST
|
||||
|
||||
class dummysocket:
|
||||
def __init__(self):
|
||||
|
|
|
@ -17,7 +17,7 @@ except ImportError:
|
|||
|
||||
from unittest import TestCase
|
||||
from test import test_support
|
||||
from test.test_support import HOST
|
||||
from test.test_support import HOST, HOSTv6
|
||||
threading = test_support.import_module('threading')
|
||||
|
||||
|
||||
|
@ -562,7 +562,7 @@ class TestFTPClass(TestCase):
|
|||
class TestIPv6Environment(TestCase):
|
||||
|
||||
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.client = ftplib.FTP()
|
||||
self.client.connect(self.server.host, self.server.port)
|
||||
|
@ -713,7 +713,7 @@ class TestTimeouts(TestCase):
|
|||
self.assertTrue(socket.getdefaulttimeout() is None)
|
||||
socket.setdefaulttimeout(30)
|
||||
try:
|
||||
ftp = ftplib.FTP("localhost")
|
||||
ftp = ftplib.FTP(HOST)
|
||||
finally:
|
||||
socket.setdefaulttimeout(None)
|
||||
self.assertEqual(ftp.sock.gettimeout(), 30)
|
||||
|
@ -725,7 +725,7 @@ class TestTimeouts(TestCase):
|
|||
self.assertTrue(socket.getdefaulttimeout() is None)
|
||||
socket.setdefaulttimeout(30)
|
||||
try:
|
||||
ftp = ftplib.FTP("localhost", timeout=None)
|
||||
ftp = ftplib.FTP(HOST, timeout=None)
|
||||
finally:
|
||||
socket.setdefaulttimeout(None)
|
||||
self.assertTrue(ftp.sock.gettimeout() is None)
|
||||
|
|
|
@ -1385,7 +1385,7 @@ class _TestRemoteManager(BaseTestCase):
|
|||
authkey = os.urandom(32)
|
||||
|
||||
manager = QueueManager(
|
||||
address=('localhost', 0), authkey=authkey, serializer=SERIALIZER
|
||||
address=(test.test_support.HOST, 0), authkey=authkey, serializer=SERIALIZER
|
||||
)
|
||||
manager.start()
|
||||
|
||||
|
@ -1423,7 +1423,7 @@ class _TestManagerRestart(BaseTestCase):
|
|||
def test_rapid_restart(self):
|
||||
authkey = os.urandom(32)
|
||||
manager = QueueManager(
|
||||
address=('localhost', 0), authkey=authkey, serializer=SERIALIZER)
|
||||
address=(test.test_support.HOST, 0), authkey=authkey, serializer=SERIALIZER)
|
||||
srvr = manager.get_server()
|
||||
addr = srvr.address
|
||||
# Close the connection.Listener socket which gets opened as a part
|
||||
|
|
|
@ -290,7 +290,12 @@ def requires(resource, msg=None):
|
|||
msg = "Use of the `%s' resource not enabled" % resource
|
||||
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):
|
||||
"""Returns an unused port that should be suitable for binding. This is
|
||||
|
|
Loading…
Reference in New Issue