summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorStefan Eissing <icing@apache.org>2024-04-22 15:55:22 +0200
committerStefan Eissing <icing@apache.org>2024-04-22 15:55:22 +0200
commitc8a9d21e0cce028ca1ad2a169ec99eb0c7a38090 (patch)
tree441fe72690e625a0a65bcd156e70739f7978ee5e /test
parentfr doc rebuild. (diff)
downloadapache2-c8a9d21e0cce028ca1ad2a169ec99eb0c7a38090.tar.xz
apache2-c8a9d21e0cce028ca1ad2a169ec99eb0c7a38090.zip
* mod_tls: update version of rustls-ffi to v0.13.0.
[Daniel McCarney (@cpu}] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1917270 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
-rw-r--r--test/modules/tls/test_08_vars.py2
-rw-r--r--test/modules/tls/test_14_proxy_ssl.py2
-rwxr-xr-xtest/travis_run_linux.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/test/modules/tls/test_08_vars.py b/test/modules/tls/test_08_vars.py
index ad764a7985..0e3ee74d2d 100644
--- a/test/modules/tls/test_08_vars.py
+++ b/test/modules/tls/test_08_vars.py
@@ -59,7 +59,7 @@ class TestVars:
@pytest.mark.parametrize("name, pattern", [
("SSL_VERSION_INTERFACE", r'mod_tls/\d+\.\d+\.\d+'),
- ("SSL_VERSION_LIBRARY", r'rustls-ffi/\d+\.\d+\.\d+/rustls/\d+\.\d+\.\d+'),
+ ("SSL_VERSION_LIBRARY", r'rustls-ffi/\d+\.\d+\.\d+/rustls/\d+\.\d+(\.\d+)?'),
])
def test_tls_08_vars_match(self, env, name: str, pattern: str):
r = env.tls_get(env.domain_b, f"/vars.py?name={name}")
diff --git a/test/modules/tls/test_14_proxy_ssl.py b/test/modules/tls/test_14_proxy_ssl.py
index 2f46c64f71..87e04c28af 100644
--- a/test/modules/tls/test_14_proxy_ssl.py
+++ b/test/modules/tls/test_14_proxy_ssl.py
@@ -100,7 +100,7 @@ class TestProxySSL:
@pytest.mark.parametrize("name, pattern", [
("SSL_VERSION_INTERFACE", r'mod_tls/\d+\.\d+\.\d+'),
- ("SSL_VERSION_LIBRARY", r'rustls-ffi/\d+\.\d+\.\d+/rustls/\d+\.\d+\.\d+'),
+ ("SSL_VERSION_LIBRARY", r'rustls-ffi/\d+\.\d+\.\d+/rustls/\d+\.\d+(\.\d+)?'),
])
def test_tls_14_proxy_tsl_vars_match(self, env, name: str, pattern: str):
if not HttpdTestEnv.has_shared_module("tls"):
diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index 1b90879ea6..89b2cd8e6f 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -266,7 +266,7 @@ fi
if test -v TEST_MOD_TLS -a $RV -eq 0; then
# Run mod_tls tests. The underlying librustls was build
# and installed before we configured the server (see top of file).
- # This will be replaved once librustls is available as a package.
+ # This will be replaced once librustls is available as a package.
py.test-3 test/modules/tls
RV=$?
fi