summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_ftplib.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2013-08-21 22:39:46 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2013-08-21 22:39:46 (GMT)
commit1e440cf5a267ce1787aa048525d45eb56fc06135 (patch)
tree4ffa3bf47f07f129bf502d6c1cc081190f642abe /Lib/test/test_ftplib.py
parent9e6b97502f3a0c5f7d24e0b7f05dc9b41b0d0b85 (diff)
downloadcpython-1e440cf5a267ce1787aa048525d45eb56fc06135.zip
cpython-1e440cf5a267ce1787aa048525d45eb56fc06135.tar.gz
cpython-1e440cf5a267ce1787aa048525d45eb56fc06135.tar.bz2
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.
Diffstat (limited to 'Lib/test/test_ftplib.py')
-rw-r--r--Lib/test/test_ftplib.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
index 3a99042..b39d753 100644
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -18,7 +18,7 @@ except ImportError:
from unittest import TestCase
from test import support
-from test.support import HOST
+from test.support import HOST, HOSTv6
threading = support.import_module('threading')
# the dummy data returned by server over the data channel when
@@ -766,7 +766,7 @@ class TestFTPClass(TestCase):
class TestIPv6Environment(TestCase):
def setUp(self):
- self.server = DummyFTPServer(('::1', 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)
@@ -949,7 +949,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)
@@ -961,7 +961,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)