Fix CPython patches

Fix needed after upstream [PR #117351][1]. [1]: python/cpython#117351
WillChilds-Klein · Apr 1, 2024 · 2258a38 · 2258a38
1 parent a1f73bc
commit 2258a38
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 36 deletions.
diff --git a/tests/ci/integration/python_patch/3.10/aws-lc-cpython.patch b/tests/ci/integration/python_patch/3.10/aws-lc-cpython.patch
@@ -253,18 +253,6 @@ index a1a581a..c69e711 100644
 
      def test_version_basic(self):
          """
-@@ -4004,7 +4016,10 @@ def test_min_max_version_mismatch(self):
-                                             server_hostname=hostname) as s:
-                 with self.assertRaises(ssl.SSLError) as e:
-                     s.connect((HOST, server.port))
--                self.assertIn("alert", str(e.exception))
-+                self.assertTrue(
-+                    "alert"in str(e.exception)
-+                    or "ALERT"in str(e.exception)
-+                )
-
-     @requires_tls_version('SSLv3')
-     def test_min_max_version_sslv3(self):
 @@ -4046,6 +4061,9 @@ def test_tls_unique_channel_binding(self):
 
          client_context, server_context, hostname = testing_context()

diff --git a/tests/ci/integration/python_patch/3.12/aws-lc-cpython.patch b/tests/ci/integration/python_patch/3.12/aws-lc-cpython.patch
@@ -32,18 +32,6 @@ index f3960be..ffd360b 100644
      def seclevel_workaround(*ctxs):
          """"Lower security level to '1' and allow all ciphers for TLS 1.0/1"""
          for ctx in ctxs:
-@@ -3822,7 +3823,10 @@ def test_min_max_version_mismatch(self):
-                                             server_hostname=hostname) as s:
-                 with self.assertRaises(ssl.SSLError) as e:
-                     s.connect((HOST, server.port))
--                self.assertRegex("(alert|ALERT)", str(e.exception))
-+                self.assertTrue(
-+                    "alert"in str(e.exception)
-+                    or "ALERT"in str(e.exception)
-+                )
-
-     @requires_tls_version('SSLv3')
-     def test_min_max_version_sslv3(self):
 @@ -3954,6 +3958,7 @@ def test_no_legacy_server_connect(self):
                                     sni_name=hostname)
 

diff --git a/tests/ci/integration/python_patch/main/aws-lc-cpython.patch b/tests/ci/integration/python_patch/main/aws-lc-cpython.patch
@@ -32,18 +32,6 @@ index 3fa806d..0983212 100644
      def seclevel_workaround(*ctxs):
          """"Lower security level to '1' and allow all ciphers for TLS 1.0/1"""
          for ctx in ctxs:
-@@ -3865,7 +3866,10 @@ def test_min_max_version_mismatch(self):
-                                             server_hostname=hostname) as s:
-                 with self.assertRaises(ssl.SSLError) as e:
-                     s.connect((HOST, server.port))
--                self.assertRegex("(alert|ALERT)", str(e.exception))
-+                self.assertTrue(
-+                    "alert"in str(e.exception)
-+                    or "ALERT"in str(e.exception)
-+                )
-
-     @requires_tls_version('SSLv3')
-     def test_min_max_version_sslv3(self):
 @@ -3997,6 +4001,7 @@ def test_no_legacy_server_connect(self):
                                     sni_name=hostname)