From 34de2d312b3687994ddbc29adb66e88f672034c7 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Fri, 18 Jan 2019 16:09:30 +0100 Subject: bpo-35045: Accept TLSv1 default in min max test (GH-11510) Make ssl tests less strict and also accept TLSv1 as system default. The changes unbreaks test_min_max_version on Fedora 29. Signed-off-by: Christian Heimes --- Lib/test/test_ssl.py | 7 +++++-- Misc/NEWS.d/next/Tests/2019-01-10-18-35-42.bpo-35045.qdd6d9.rst | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Tests/2019-01-10-18-35-42.bpo-35045.qdd6d9.rst diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 1fc657f..9e571cc 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -1088,8 +1088,11 @@ class ContextTests(unittest.TestCase): "required OpenSSL 1.1.0g") def test_min_max_version(self): ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) - self.assertEqual( - ctx.minimum_version, ssl.TLSVersion.MINIMUM_SUPPORTED + # OpenSSL default is MINIMUM_SUPPORTED, however some vendors like + # Fedora override the setting to TLS 1.0. + self.assertIn( + ctx.minimum_version, + {ssl.TLSVersion.MINIMUM_SUPPORTED, ssl.TLSVersion.TLSv1} ) self.assertEqual( ctx.maximum_version, ssl.TLSVersion.MAXIMUM_SUPPORTED diff --git a/Misc/NEWS.d/next/Tests/2019-01-10-18-35-42.bpo-35045.qdd6d9.rst b/Misc/NEWS.d/next/Tests/2019-01-10-18-35-42.bpo-35045.qdd6d9.rst new file mode 100644 index 0000000..630a22d --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2019-01-10-18-35-42.bpo-35045.qdd6d9.rst @@ -0,0 +1,2 @@ +Make ssl tests less strict and also accept TLSv1 as system default. The +changes unbreaks test_min_max_version on Fedora 29. -- cgit v0.12