Merging upstream version 2.4.59.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 5 insertions, 7 deletions

diff --git a/test/modules/tls/test_05_proto.py b/test/modules/tls/test_05_proto.py
index 447d052..d874a90 100644
--- a/test/modules/tls/test_05_proto.py
+++ b/test/modules/tls/test_05_proto.py
@@ -33,16 +33,14 @@ class TestProto:
     def test_tls_05_proto_1_2(self, env):
         r = env.tls_get(env.domain_b, "/index.json", options=["--tlsv1.2"])
         assert r.exit_code == 0, r.stderr
-        if TlsTestEnv.curl_supports_tls_1_3():
-            r = env.tls_get(env.domain_b, "/index.json", options=["--tlsv1.3"])
-            assert r.exit_code == 0, r.stderr
 
+    @pytest.mark.skip('curl does not have TLSv1.3 on all platforms')
     def test_tls_05_proto_1_3(self, env):
-        r = env.tls_get(env.domain_a, "/index.json", options=["--tlsv1.3"])
-        if TlsTestEnv.curl_supports_tls_1_3():
-            assert r.exit_code == 0, r.stderr
+        r = env.tls_get(env.domain_a, "/index.json", options=["--tlsv1.3", '-v'])
+        if True: # testing TlsTestEnv.curl_supports_tls_1_3() is unreliable (curl should support TLS1.3 nowadays..)
+            assert r.exit_code == 0, f'{r}'
         else:
-            assert r.exit_code == 4, r.stderr
+            assert r.exit_code == 4, f'{r}'
 
     def test_tls_05_proto_close(self, env):
         s = socket.create_connection(('localhost', env.https_port))