]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-35045: Accept TLSv1 default in min max test (GH-11510)
authorChristian Heimes <christian@python.org>
Fri, 18 Jan 2019 15:09:30 +0000 (16:09 +0100)
committerVictor Stinner <vstinner@redhat.com>
Fri, 18 Jan 2019 15:09:30 +0000 (16:09 +0100)
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 <christian@python.org>
Lib/test/test_ssl.py
Misc/NEWS.d/next/Tests/2019-01-10-18-35-42.bpo-35045.qdd6d9.rst [new file with mode: 0644]

index 1fc657f4d867bb171662abc01ec277ca67fd416e..9e571cc78e4b07036dd873939c8c96f8cadbc902 100644 (file)
@@ -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 (file)
index 0000000..630a22d
--- /dev/null
@@ -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.