bpo-38815: Accept TLSv3 default in min max test (GH-NNNN)

torsava · torsava · commit 04bc8cd0f40c · 2019-12-02T16:31:17.000+01:00
Make ssl tests less strict and also accept TLSv3 as the default maximum
version. This change unbreaks test_min_max_version on Fedora 32.
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
@@ -1203,12 +1203,18 @@ def test_min_max_version(self):
             # RHEL 8 uses TLS 1.2 by default
             ssl.TLSVersion.TLSv1_2
         }
+        maximum_range = {
+            # stock OpenSSL
+            ssl.TLSVersion.MAXIMUM_SUPPORTED,
+            # Fedora 32 uses TLS 1.3 by default
+            ssl.TLSVersion.TLSv1_3
+        }
 
         self.assertIn(
             ctx.minimum_version, minimum_range
         )
-        self.assertEqual(
-            ctx.maximum_version, ssl.TLSVersion.MAXIMUM_SUPPORTED
+        self.assertIn(
+            ctx.maximum_version, maximum_range
         )
 
         ctx.minimum_version = ssl.TLSVersion.TLSv1_1

Original file line number	Diff line number	Diff line change
`@@ -1203,12 +1203,18 @@ def test_min_max_version(self):`
`1203`	`1203`	`# RHEL 8 uses TLS 1.2 by default`
`1204`	`1204`	`ssl.TLSVersion.TLSv1_2`
`1205`	`1205`	`}`
	`1206`	`+ maximum_range = {`
	`1207`	`+ # stock OpenSSL`
	`1208`	`+ ssl.TLSVersion.MAXIMUM_SUPPORTED,`
	`1209`	`+ # Fedora 32 uses TLS 1.3 by default`
	`1210`	`+ ssl.TLSVersion.TLSv1_3`
	`1211`	`+ }`
`1206`	`1212`
`1207`	`1213`	`self.assertIn(`
`1208`	`1214`	`ctx.minimum_version, minimum_range`
`1209`	`1215`	`)`
`1210`		`- self.assertEqual(`
`1211`		`- ctx.maximum_version, ssl.TLSVersion.MAXIMUM_SUPPORTED`
	`1216`	`+ self.assertIn(`
	`1217`	`+ ctx.maximum_version, maximum_range`
`1212`	`1218`	`)`
`1213`	`1219`
`1214`	`1220`	`ctx.minimum_version = ssl.TLSVersion.TLSv1_1`