bpo-36019: Use pythontest.net instead of example.com in network tests (GH-11941)
(cherry picked from commit a40681dd5db8deaf05a635eecb91498dac882aa4)
Co-authored-by: Stéphane Wirtel <stephane@wirtel.be>
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index a9cfa2a..9d6fd44 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -815,6 +815,10 @@
# module name.
TESTFN = "{}_{}_tmp".format(TESTFN, os.getpid())
+# Define the URL of a dedicated HTTP server for the network tests.
+# The URL must use clear-text HTTP: no redirection to encrypted HTTPS.
+TEST_HTTP_URL = "http://www.pythontest.net"
+
# FS_NONASCII: non-ASCII character encodable by os.fsencode(),
# or None if there is no such character.
FS_NONASCII = None
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index c292d74..2ac73b5 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -712,7 +712,7 @@
with self.assertRaises(urllib.error.ContentTooShortError):
try:
- urllib.request.urlretrieve('http://example.com/',
+ urllib.request.urlretrieve(support.TEST_HTTP_URL,
reporthook=_reporthook)
finally:
self.unfakehttp()
@@ -729,7 +729,7 @@
''')
with self.assertRaises(urllib.error.ContentTooShortError):
try:
- urllib.request.urlretrieve('http://example.com/')
+ urllib.request.urlretrieve(support.TEST_HTTP_URL)
finally:
self.unfakehttp()
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index 1aa64cb..0f43d71 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -84,7 +84,7 @@
def test_close(self):
# calling .close() on urllib2's response objects should close the
# underlying socket
- url = "http://www.example.com/"
+ url = support.TEST_HTTP_URL
with support.transient_internet(url):
response = _urlopen_with_retry(url)
sock = response.fp
@@ -173,7 +173,7 @@
"http://www.pythontest.net/elsewhere/#frag")
def test_custom_headers(self):
- url = "http://www.example.com"
+ url = support.TEST_HTTP_URL
with support.transient_internet(url):
opener = urllib.request.build_opener()
request = urllib.request.Request(url)
@@ -259,7 +259,7 @@
class TimeoutTest(unittest.TestCase):
def test_http_basic(self):
self.assertIsNone(socket.getdefaulttimeout())
- url = "http://www.example.com"
+ url = support.TEST_HTTP_URL
with support.transient_internet(url, timeout=None):
u = _urlopen_with_retry(url)
self.addCleanup(u.close)
@@ -267,7 +267,7 @@
def test_http_default_timeout(self):
self.assertIsNone(socket.getdefaulttimeout())
- url = "http://www.example.com"
+ url = support.TEST_HTTP_URL
with support.transient_internet(url):
socket.setdefaulttimeout(60)
try:
@@ -279,7 +279,7 @@
def test_http_no_timeout(self):
self.assertIsNone(socket.getdefaulttimeout())
- url = "http://www.example.com"
+ url = support.TEST_HTTP_URL
with support.transient_internet(url):
socket.setdefaulttimeout(60)
try:
@@ -290,7 +290,7 @@
self.assertIsNone(u.fp.raw._sock.gettimeout())
def test_http_timeout(self):
- url = "http://www.example.com"
+ url = support.TEST_HTTP_URL
with support.transient_internet(url):
u = _urlopen_with_retry(url, timeout=120)
self.addCleanup(u.close)
diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
index 4103b6c..d394ced 100644
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -3,6 +3,7 @@
import contextlib
import socket
+import urllib.parse
import urllib.request
import os
import email.message
@@ -24,8 +25,9 @@
socket.setdefaulttimeout(None)
def testURLread(self):
- with support.transient_internet("www.example.com"):
- f = urllib.request.urlopen("http://www.example.com/")
+ domain = urllib.parse.urlparse(support.TEST_HTTP_URL).netloc
+ with support.transient_internet(domain):
+ f = urllib.request.urlopen(support.TEST_HTTP_URL)
f.read()