mirror of https://github.com/python/cpython
Issue #20939: Use www.example.com instead of www.python.org to avoid test
failures when ssl is not present.
This commit is contained in:
Ned Deily
parent
fd9262cf2a
commit
e558181660
|
|
@ -84,7 +84,7 @@ class CloseSocketTest(unittest.TestCase):
|
|||
# calling .close() on urllib2's response objects should close the
|
||||
# underlying socket
|
||||
|
||||
response = _urlopen_with_retry("http://www.python.org/")
|
||||
response = _urlopen_with_retry("http://www.example.com/")
|
||||
sock = response.fp
|
||||
self.assertTrue(not sock.closed)
|
||||
response.close()
|
||||
|
|
@ -254,7 +254,7 @@ class OtherNetworkTests(unittest.TestCase):
|
|||
class TimeoutTest(unittest.TestCase):
|
||||
def test_http_basic(self):
|
||||
self.assertTrue(socket.getdefaulttimeout() is None)
|
||||
url = "http://www.python.org"
|
||||
url = "http://www.example.com"
|
||||
with support.transient_internet(url, timeout=None):
|
||||
u = _urlopen_with_retry(url)
|
||||
self.addCleanup(u.close)
|
||||
|
|
@ -262,7 +262,7 @@ class TimeoutTest(unittest.TestCase):
|
|||
|
||||
def test_http_default_timeout(self):
|
||||
self.assertTrue(socket.getdefaulttimeout() is None)
|
||||
url = "http://www.python.org"
|
||||
url = "http://www.example.com"
|
||||
with support.transient_internet(url):
|
||||
socket.setdefaulttimeout(60)
|
||||
try:
|
||||
|
|
@ -274,7 +274,7 @@ class TimeoutTest(unittest.TestCase):
|
|||
|
||||
def test_http_no_timeout(self):
|
||||
self.assertTrue(socket.getdefaulttimeout() is None)
|
||||
url = "http://www.python.org"
|
||||
url = "http://www.example.com"
|
||||
with support.transient_internet(url):
|
||||
socket.setdefaulttimeout(60)
|
||||
try:
|
||||
|
|
@ -285,7 +285,7 @@ class TimeoutTest(unittest.TestCase):
|
|||
self.assertTrue(u.fp.raw._sock.gettimeout() is None)
|
||||
|
||||
def test_http_timeout(self):
|
||||
url = "http://www.python.org"
|
||||
url = "http://www.example.com"
|
||||
with support.transient_internet(url):
|
||||
u = _urlopen_with_retry(url, timeout=120)
|
||||
self.addCleanup(u.close)
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ class URLTimeoutTest(unittest.TestCase):
|
|||
socket.setdefaulttimeout(None)
|
||||
|
||||
def testURLread(self):
|
||||
with support.transient_internet("www.python.org"):
|
||||
f = urllib.request.urlopen("http://www.python.org/")
|
||||
with support.transient_internet("www.example.com"):
|
||||
f = urllib.request.urlopen("http://www.example.com/")
|
||||
x = f.read()
|
||||
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ class urlopenNetworkTests(unittest.TestCase):
|
|||
for transparent redirection have been written.
|
||||
|
||||
setUp is not used for always constructing a connection to
|
||||
http://www.python.org/ since there a few tests that don't use that address
|
||||
http://www.example.com/ since there a few tests that don't use that address
|
||||
and making a connection is expensive enough to warrant minimizing unneeded
|
||||
connections.
|
||||
|
||||
|
|
@ -56,7 +56,7 @@ class urlopenNetworkTests(unittest.TestCase):
|
|||
|
||||
def test_basic(self):
|
||||
# Simple test expected to pass.
|
||||
with self.urlopen("http://www.python.org/") as open_url:
|
||||
with self.urlopen("http://www.example.com/") as open_url:
|
||||
for attr in ("read", "readline", "readlines", "fileno", "close",
|
||||
"info", "geturl"):
|
||||
self.assertTrue(hasattr(open_url, attr), "object returned from "
|
||||
|
|
@ -65,7 +65,7 @@ class urlopenNetworkTests(unittest.TestCase):
|
|||
|
||||
def test_readlines(self):
|
||||
# Test both readline and readlines.
|
||||
with self.urlopen("http://www.python.org/") as open_url:
|
||||
with self.urlopen("http://www.example.com/") as open_url:
|
||||
self.assertIsInstance(open_url.readline(), bytes,
|
||||
"readline did not return a string")
|
||||
self.assertIsInstance(open_url.readlines(), list,
|
||||
|
|
@ -73,7 +73,7 @@ class urlopenNetworkTests(unittest.TestCase):
|
|||
|
||||
def test_info(self):
|
||||
# Test 'info'.
|
||||
with self.urlopen("http://www.python.org/") as open_url:
|
||||
with self.urlopen("http://www.example.com/") as open_url:
|
||||
info_obj = open_url.info()
|
||||
self.assertIsInstance(info_obj, email.message.Message,
|
||||
"object returned by 'info' is not an "
|
||||
|
|
@ -82,14 +82,14 @@ class urlopenNetworkTests(unittest.TestCase):
|
|||
|
||||
def test_geturl(self):
|
||||
# Make sure same URL as opened is returned by geturl.
|
||||
URL = "http://www.python.org/"
|
||||
URL = "http://www.example.com/"
|
||||
with self.urlopen(URL) as open_url:
|
||||
gotten_url = open_url.geturl()
|
||||
self.assertEqual(gotten_url, URL)
|
||||
|
||||
def test_getcode(self):
|
||||
# test getcode() with the fancy opener to get 404 error codes
|
||||
URL = "http://www.python.org/XXXinvalidXXX"
|
||||
URL = "http://www.example.com/XXXinvalidXXX"
|
||||
with support.transient_internet(URL):
|
||||
open_url = urllib.request.FancyURLopener().open(URL)
|
||||
try:
|
||||
|
|
@ -104,7 +104,7 @@ class urlopenNetworkTests(unittest.TestCase):
|
|||
# test can't pass on Windows.
|
||||
return
|
||||
# Make sure fd returned by fileno is valid.
|
||||
with self.urlopen("http://www.python.org/", timeout=None) as open_url:
|
||||
with self.urlopen("http://www.example.com/", timeout=None) as open_url:
|
||||
fd = open_url.fileno()
|
||||
with os.fdopen(fd, 'rb') as f:
|
||||
self.assertTrue(f.read(), "reading from file created using fd "
|
||||
|
|
@ -148,7 +148,7 @@ class urlretrieveNetworkTests(unittest.TestCase):
|
|||
|
||||
def test_basic(self):
|
||||
# Test basic functionality.
|
||||
with self.urlretrieve("http://www.python.org/") as (file_location, info):
|
||||
with self.urlretrieve("http://www.example.com/") as (file_location, info):
|
||||
self.assertTrue(os.path.exists(file_location), "file location returned by"
|
||||
" urlretrieve is not a valid path")
|
||||
with open(file_location, 'rb') as f:
|
||||
|
|
@ -157,7 +157,7 @@ class urlretrieveNetworkTests(unittest.TestCase):
|
|||
|
||||
def test_specified_path(self):
|
||||
# Make sure that specifying the location of the file to write to works.
|
||||
with self.urlretrieve("http://www.python.org/",
|
||||
with self.urlretrieve("http://www.example.com/",
|
||||
support.TESTFN) as (file_location, info):
|
||||
self.assertEqual(file_location, support.TESTFN)
|
||||
self.assertTrue(os.path.exists(file_location))
|
||||
|
|
@ -166,12 +166,12 @@ class urlretrieveNetworkTests(unittest.TestCase):
|
|||
|
||||
def test_header(self):
|
||||
# Make sure header returned as 2nd value from urlretrieve is good.
|
||||
with self.urlretrieve("http://www.python.org/") as (file_location, info):
|
||||
with self.urlretrieve("http://www.example.com/") as (file_location, info):
|
||||
self.assertIsInstance(info, email.message.Message,
|
||||
"info is not an instance of email.message.Message")
|
||||
|
||||
def test_data_header(self):
|
||||
logo = "http://www.python.org/static/community_logos/python-logo-master-v3-TM.png"
|
||||
logo = "http://www.example.com/"
|
||||
with self.urlretrieve(logo) as (file_location, fileheaders):
|
||||
datevalue = fileheaders.get('Date')
|
||||
dateformat = '%a, %d %b %Y %H:%M:%S GMT'
|
||||
|
|
|
|||
|
|
@ -76,6 +76,13 @@ Library
|
|||
- Issue #21323: Fix http.server to again handle scripts in CGI subdirectories,
|
||||
broken by the fix for security issue #19435. Patch by Zach Byrne.
|
||||
|
||||
Tests
|
||||
-----
|
||||
|
||||
- Issue #20939: Avoid various network test failures due to new
|
||||
redirect of http://www.python.org/ to https://www.python.org:
|
||||
use http://www.example.com instead.
|
||||
|
||||
|
||||
What's New in Python 3.2.5?
|
||||
===========================
|
||||
|
|
|
|||
Loading…
Reference in New Issue