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

miss-islington · torsava · web-flow · commit 1f4f28cbf3ca · 2019-12-02T08:35:50.000-08: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. https://bugs.python.org/issue38815 (cherry picked from commit 34864d1) Co-authored-by: torsava <torsava@redhat.com>
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
@@ -1220,12 +1220,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
`@@ -1220,12 +1220,18 @@ def test_min_max_version(self):`
`1220`	`1220`	`# RHEL 8 uses TLS 1.2 by default`
`1221`	`1221`	`ssl.TLSVersion.TLSv1_2`
`1222`	`1222`	`}`
	`1223`	`+ maximum_range = {`
	`1224`	`+ # stock OpenSSL`
	`1225`	`+ ssl.TLSVersion.MAXIMUM_SUPPORTED,`
	`1226`	`+ # Fedora 32 uses TLS 1.3 by default`
	`1227`	`+ ssl.TLSVersion.TLSv1_3`
	`1228`	`+ }`
`1223`	`1229`
`1224`	`1230`	`self.assertIn(`
`1225`	`1231`	`ctx.minimum_version, minimum_range`
`1226`	`1232`	`)`
`1227`		`- self.assertEqual(`
`1228`		`- ctx.maximum_version, ssl.TLSVersion.MAXIMUM_SUPPORTED`
	`1233`	`+ self.assertIn(`
	`1234`	`+ ctx.maximum_version, maximum_range`
`1229`	`1235`	`)`
`1230`	`1236`
`1231`	`1237`	`ctx.minimum_version = ssl.TLSVersion.TLSv1_1`