Commit 15c02ac7 authored by Berker Peksag's avatar Berker Peksag

Issue #21456: Skip two tests in test_urllib2net.py if _ssl module not present.

Patch by Remi Pointel.
parent 4be36b0a
...@@ -7,11 +7,14 @@ import socket ...@@ -7,11 +7,14 @@ import socket
import urllib.error import urllib.error
import urllib.request import urllib.request
import sys import sys
try: try:
import ssl import ssl
except ImportError: except ImportError:
ssl = None ssl = None
requires_ssl = unittest.skipIf(ssl is None, "SSL not supported")
support.requires("network") support.requires("network")
TIMEOUT = 60 # seconds TIMEOUT = 60 # seconds
...@@ -156,6 +159,7 @@ class OtherNetworkTests(unittest.TestCase): ...@@ -156,6 +159,7 @@ class OtherNetworkTests(unittest.TestCase):
## self._test_urls(urls, self._extra_handlers()+[bauth, dauth]) ## self._test_urls(urls, self._extra_handlers()+[bauth, dauth])
@requires_ssl
def test_urlwithfrag(self): def test_urlwithfrag(self):
urlwith_frag = "https://docs.python.org/2/glossary.html#glossary" urlwith_frag = "https://docs.python.org/2/glossary.html#glossary"
with support.transient_internet(urlwith_frag): with support.transient_internet(urlwith_frag):
...@@ -164,6 +168,7 @@ class OtherNetworkTests(unittest.TestCase): ...@@ -164,6 +168,7 @@ class OtherNetworkTests(unittest.TestCase):
self.assertEqual(res.geturl(), self.assertEqual(res.geturl(),
"https://docs.python.org/2/glossary.html#glossary") "https://docs.python.org/2/glossary.html#glossary")
@requires_ssl
def test_redirect_url_withfrag(self): def test_redirect_url_withfrag(self):
redirect_url_with_frag = "http://bit.ly/1iSHToT" redirect_url_with_frag = "http://bit.ly/1iSHToT"
with support.transient_internet(redirect_url_with_frag): with support.transient_internet(redirect_url_with_frag):
......
...@@ -55,6 +55,12 @@ Library ...@@ -55,6 +55,12 @@ Library
- Issue #22448: Improve canceled timer handles cleanup to prevent - Issue #22448: Improve canceled timer handles cleanup to prevent
unbound memory usage. Patch by Joshua Moore-Oliva. unbound memory usage. Patch by Joshua Moore-Oliva.
Tests
-----
- Issue #21456: Skip two tests in test_urllib2net.py if _ssl module not
present. Patch by Remi Pointel.
Build Build
----- -----
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment