From: Stefan Eissing <icing@apache.org>
Date: Tue, 8 Feb 2022 10:02:14 +0000 (+0000)
Subject:   *) test: fixing tls test case for a non-working curl
X-Git-Tag: 2.4.53-rc1-candidate~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=727257145d4e5b060f0a963b6e3605d6d6b81f0b;p=thirdparty%2Fapache%2Fhttpd.git

  *) test: fixing tls test case for a non-working curl
     check on TLSv1.3 support.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1897850 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/modules/tls/test_08_vars.py b/test/modules/tls/test_08_vars.py
index baaed382055..45272133463 100644
--- a/test/modules/tls/test_08_vars.py
+++ b/test/modules/tls/test_08_vars.py
@@ -1,9 +1,9 @@
 import re
-from datetime import timedelta
 
 import pytest
 
 from .conf import TlsTestConf
+from .env import TlsTestEnv
 
 
 class TestVars:
@@ -22,13 +22,10 @@ class TestVars:
 
     def test_08_vars_root(self, env):
         # in domain_b root, the StdEnvVars is switch on
-        if env.curl_supports_tls_1_3():
-            exp_proto = "TLSv1.3"
-            exp_cipher = "TLS_AES_256_GCM_SHA384"
-        else:
-            exp_proto = "TLSv1.2"
-            exp_cipher = "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
-        r = env.tls_get(env.domain_b, "/vars.py")
+        exp_proto = "TLSv1.2"
+        exp_cipher = "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
+        options = [ '--tls-max', '1.2']
+        r = env.tls_get(env.domain_b, "/vars.py", options=options)
         assert r.exit_code == 0, r.stderr
         assert r.json == {
             'https': 'on',
@@ -37,7 +34,7 @@ class TestVars:
             'ssl_protocol': exp_proto,
             # this will vary by client potentially
             'ssl_cipher': exp_cipher,
-        }, r.stdout
+        }
 
     @pytest.mark.parametrize("name, value", [
         ("SERVER_NAME", "b.mod-tls.test"),