Skip to content
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

Jump to bottom

bpo-33354 Fix test_ssl.py without skipping. #7697

Closed
wants to merge 3 commits into from
Closed

bpo-33354 Fix test_ssl.py without skipping. #7697

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0bf17f
Fix test_ssl.py without skipping.
Jun 14, 2018
778f310
decouple non-ascii filepath test and dh_param load test.
Jun 14, 2018
58abee1
remove non-ascii path test as it skips anyway
Jun 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 0 additions & 12 deletions Lib/test/test_ssl.py
View file
Open in desktop
Expand Up @@ -987,15 +987,7 @@ def test_load_verify_cadata(self):
with self.assertRaisesRegexp(ssl.SSLError, "not enough data"):
ctx.load_verify_locations(cadata=b"broken")


def test_load_dh_params(self):
filename = u'dhpäräm.pem'
fs_encoding = sys.getfilesystemencoding()
try:
filename.encode(fs_encoding)
except UnicodeEncodeError:
self.skipTest("filename %r cannot be encoded to the filesystem encoding %r" % (filename, fs_encoding))

ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
ctx.load_dh_params(DHFILE)
if os.name != 'nt':
Expand All @@ -1007,10 +999,6 @@ def test_load_dh_params(self):
self.assertEqual(cm.exception.errno, errno.ENOENT)
with self.assertRaises(ssl.SSLError) as cm:
ctx.load_dh_params(CERTFILE)
with support.temp_dir() as d:
fname = os.path.join(d, filename)
shutil.copy(DHFILE, fname)
ctx.load_dh_params(fname)

@skip_if_broken_ubuntu_ssl
def test_session_stats(self):
Expand Down