Skip to content

bpo-36019: Use pythontest.net instead of example.com #11941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 17 commits into from
Feb 22, 2019
Merged

bpo-36019: Use pythontest.net instead of example.com #11941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7204921
bpo-36019: Use pythontest.net instead of example.com
matrixise Feb 19, 2019
5f726be
Add blurb entry
matrixise Feb 19, 2019
039455e
Fix test_urllibnet
matrixise Feb 19, 2019
e885ac7
Add test.support.TEST_HTTP_URL for the tests
matrixise Feb 21, 2019
689fdc6
Fix a test
matrixise Feb 21, 2019
a507631
Revert the changes in the tests with pythontest.net/unicode/
matrixise Feb 21, 2019
b1c00eb
Fix typo with TEST_HTTP_URL
matrixise Feb 21, 2019
8fec9c6
Remove the ReST role
matrixise Feb 21, 2019
e90553c
Fix with the recommenation of Victor Stinner
matrixise Feb 21, 2019
6559361
Remove useless f-string
matrixise Feb 21, 2019
37b5de3
Use http://www.pythontest.net
matrixise Feb 21, 2019
25bf689
Remove useless modifications for the review
matrixise Feb 21, 2019
5329286
Reset TEST_HTTP_URL to http://www.pythontest.test - sorry it's my fau…
matrixise Feb 21, 2019
c062224
Update with the remarks of Victor Stinner
matrixise Feb 21, 2019
cfafca6
Define TEST_HOSTNAME and use it for TEST_HTTP_URL and use it in test_…
matrixise Feb 21, 2019
33a4744
Revert the commit with the introduction of support.TEST_HOSTNAME
matrixise Feb 22, 2019
e4f8128
Compute the domain from supoort.TEST_HTTP_URL
matrixise Feb 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Doc/library/test.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,10 @@ The :mod:`test.support` module defines the following constants:

Check for presence of docstrings.

.. data:: TEST_HTTP_URL

Define the URL of a dedicated HTTP server for the network tests.



The :mod:`test.support` module defines the following functions:
Expand Down
4 changes: 4 additions & 0 deletions Lib/test/support/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,10 @@ def dec(*args, **kwargs):
# 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
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_urllib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ def _reporthook(par1, par2, par3):

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()
Expand All @@ -729,7 +729,7 @@ def test_short_content_raises_ContentTooShortError_without_reporthook(self):
''')
with self.assertRaises(urllib.error.ContentTooShortError):
try:
urllib.request.urlretrieve('http://example.com/')
urllib.request.urlretrieve(support.TEST_HTTP_URL)
finally:
self.unfakehttp()

Expand Down
12 changes: 6 additions & 6 deletions Lib/test/test_urllib2net.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class CloseSocketTest(unittest.TestCase):
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
Expand Down Expand Up @@ -173,7 +173,7 @@ def test_redirect_url_withfrag(self):
"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)
Expand Down Expand Up @@ -259,15 +259,15 @@ def _extra_handlers(self):
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)
self.assertIsNone(u.fp.raw._sock.gettimeout())

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:
Expand All @@ -279,7 +279,7 @@ def test_http_default_timeout(self):

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:
Expand All @@ -290,7 +290,7 @@ def test_http_no_timeout(self):
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)
Expand Down
6 changes: 4 additions & 2 deletions Lib/test/test_urllibnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import contextlib
import socket
import urllib.parse
import urllib.request
import os
import email.message
Expand All @@ -24,8 +25,9 @@ def tearDown(self):
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
Copy link
Member

@vstinner vstinner Feb 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good :-)

with support.transient_internet(domain):
f = urllib.request.urlopen(support.TEST_HTTP_URL)
f.read()


Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Tests/2019-02-21-14-23-51.bpo-36019.zS_OUi.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Add test.support.TEST_HTTP_URL and replace references of http://www.example.com
by this new constant. Contributed by Stéphane Wirtel.