summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorRainer Jung <rjung@apache.org>2024-07-18 00:02:27 +0200
committerRainer Jung <rjung@apache.org>2024-07-18 00:02:27 +0200
commitc8e629e485ee251c98318e653a011e59aebd9f6a (patch)
treefc5f7c231e13af296ac526cc707d4338da8df394 /test
parentFix typo in test name (diff)
downloadapache2-c8e629e485ee251c98318e653a011e59aebd9f6a.tar.xz
apache2-c8e629e485ee251c98318e653a011e59aebd9f6a.zip
Skip h2 tests on prefork
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919332 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
-rw-r--r--test/modules/tls/env.py6
-rw-r--r--test/modules/tls/test_07_alpn.py2
-rw-r--r--test/modules/tls/test_14_proxy_ssl.py2
-rw-r--r--test/modules/tls/test_15_proxy_tls.py3
4 files changed, 13 insertions, 0 deletions
diff --git a/test/modules/tls/env.py b/test/modules/tls/env.py
index 6afc472cb0..efc4f0b247 100644
--- a/test/modules/tls/env.py
+++ b/test/modules/tls/env.py
@@ -56,6 +56,12 @@ class TlsTestEnv(HttpdTestEnv):
CURL_SUPPORTS_TLS_1_3 = None
@classmethod
+ @property
+ def is_unsupported(cls):
+ mpm_module = f"mpm_{os.environ['MPM']}" if 'MPM' in os.environ else 'mpm_event'
+ return mpm_module == 'mpm_prefork'
+
+ @classmethod
def curl_supports_tls_1_3(cls) -> bool:
if cls.CURL_SUPPORTS_TLS_1_3 is None:
# Unfortunately, there is no reliable, platform-independant
diff --git a/test/modules/tls/test_07_alpn.py b/test/modules/tls/test_07_alpn.py
index 06aff3caae..aa7e1b844c 100644
--- a/test/modules/tls/test_07_alpn.py
+++ b/test/modules/tls/test_07_alpn.py
@@ -4,8 +4,10 @@ from datetime import timedelta
import pytest
from .conf import TlsTestConf
+from .env import TlsTestEnv
+@pytest.mark.skipif(condition=TlsTestEnv.is_unsupported, reason="h2 not supported here")
class TestAlpn:
@pytest.fixture(autouse=True, scope='class')
diff --git a/test/modules/tls/test_14_proxy_ssl.py b/test/modules/tls/test_14_proxy_ssl.py
index f5ed445f84..81cb4f31b0 100644
--- a/test/modules/tls/test_14_proxy_ssl.py
+++ b/test/modules/tls/test_14_proxy_ssl.py
@@ -2,6 +2,7 @@ import re
import pytest
from .conf import TlsTestConf
+from .env import TlsTestEnv
from pyhttpd.env import HttpdTestEnv
@@ -63,6 +64,7 @@ class TestProxySSL:
]
)
+ @pytest.mark.skipif(condition=TlsTestEnv.is_unsupported, reason="h2 not supported here")
def test_tls_14_proxy_ssl_h2_get(self, env):
r = env.tls_get(env.domain_b, "/proxy-h2-ssl/index.json")
assert r.exit_code == 0
diff --git a/test/modules/tls/test_15_proxy_tls.py b/test/modules/tls/test_15_proxy_tls.py
index e7eb10362b..3fe6cfe478 100644
--- a/test/modules/tls/test_15_proxy_tls.py
+++ b/test/modules/tls/test_15_proxy_tls.py
@@ -3,6 +3,7 @@ from datetime import timedelta
import pytest
from .conf import TlsTestConf
+from .env import TlsTestEnv
from pyhttpd.env import HttpdTestEnv
@pytest.mark.skipif(condition=not HttpdTestEnv.has_shared_module("tls"), reason="no mod_tls available")
@@ -62,6 +63,7 @@ class TestProxyTLS:
]
)
+ @pytest.mark.skipif(condition=TlsTestEnv.is_unsupported, reason="h2 not supported here")
def test_tls_15_proxy_tls_h2_get(self, env):
r = env.tls_get(env.domain_b, "/proxy-h2-tls/index.json")
assert r.exit_code == 0
@@ -88,6 +90,7 @@ class TestProxyTLS:
("SSL_CIPHER", "TLS_CHACHA20_POLY1305_SHA256"),
("SSL_SESSION_RESUMED", "Initial"),
])
+ @pytest.mark.skipif(condition=TlsTestEnv.is_unsupported, reason="h2 not supported here")
def test_tls_15_proxy_tls_h2_vars(self, env, name: str, value: str):
r = env.tls_get(env.domain_b, f"/proxy-h2-tls/vars.py?name={name}")
assert r.exit_code == 0, r.stderr