You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2022/02/25 13:17:11 UTC
svn commit: r1898417 - in /httpd/httpd/trunk/test: modules/http2/ pyhttpd/
Author: icing
Date: Fri Feb 25 13:17:11 2022
New Revision: 1898417
URL: http://svn.apache.org/viewvc?rev=1898417&view=rev
Log:
*) test: check for the mpm module used and disable http2 tests
for prefork.
Modified:
httpd/httpd/trunk/test/modules/http2/env.py
httpd/httpd/trunk/test/modules/http2/test_001_httpd_alive.py
httpd/httpd/trunk/test/modules/http2/test_002_curl_basics.py
httpd/httpd/trunk/test/modules/http2/test_003_get.py
httpd/httpd/trunk/test/modules/http2/test_004_post.py
httpd/httpd/trunk/test/modules/http2/test_005_files.py
httpd/httpd/trunk/test/modules/http2/test_006_assets.py
httpd/httpd/trunk/test/modules/http2/test_100_conn_reuse.py
httpd/httpd/trunk/test/modules/http2/test_101_ssl_reneg.py
httpd/httpd/trunk/test/modules/http2/test_102_require.py
httpd/httpd/trunk/test/modules/http2/test_103_upgrade.py
httpd/httpd/trunk/test/modules/http2/test_104_padding.py
httpd/httpd/trunk/test/modules/http2/test_105_timeout.py
httpd/httpd/trunk/test/modules/http2/test_106_shutdown.py
httpd/httpd/trunk/test/modules/http2/test_200_header_invalid.py
httpd/httpd/trunk/test/modules/http2/test_201_header_conditional.py
httpd/httpd/trunk/test/modules/http2/test_202_trailer.py
httpd/httpd/trunk/test/modules/http2/test_300_interim.py
httpd/httpd/trunk/test/modules/http2/test_400_push.py
httpd/httpd/trunk/test/modules/http2/test_401_early_hints.py
httpd/httpd/trunk/test/modules/http2/test_500_proxy.py
httpd/httpd/trunk/test/modules/http2/test_501_proxy_serverheader.py
httpd/httpd/trunk/test/modules/http2/test_502_proxy_port.py
httpd/httpd/trunk/test/modules/http2/test_600_h2proxy.py
httpd/httpd/trunk/test/modules/http2/test_700_load_get.py
httpd/httpd/trunk/test/modules/http2/test_710_load_post_static.py
httpd/httpd/trunk/test/modules/http2/test_711_load_post_cgi.py
httpd/httpd/trunk/test/modules/http2/test_712_buffering.py
httpd/httpd/trunk/test/pyhttpd/env.py
Modified: httpd/httpd/trunk/test/modules/http2/env.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/env.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/env.py (original)
+++ httpd/httpd/trunk/test/modules/http2/env.py Fri Feb 25 13:17:11 2022
@@ -57,6 +57,11 @@ class H2TestSetup(HttpdTestSetup):
class H2TestEnv(HttpdTestEnv):
+ @classmethod
+ def is_unsupported(cls):
+ mpm_module = f"mpm_{os.environ['MPM']}" if 'MPM' in os.environ else 'mpm_event'
+ return mpm_module in ['mpm_prefork']
+
def __init__(self, pytestconfig=None):
super().__init__(pytestconfig=pytestconfig)
self.add_httpd_conf([
Modified: httpd/httpd/trunk/test/modules/http2/test_001_httpd_alive.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_001_httpd_alive.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_001_httpd_alive.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_001_httpd_alive.py Fri Feb 25 13:17:11 2022
@@ -1,8 +1,9 @@
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestBasicAlive:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_002_curl_basics.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_002_curl_basics.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_002_curl_basics.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_002_curl_basics.py Fri Feb 25 13:17:11 2022
@@ -1,8 +1,9 @@
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestCurlBasics:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_003_get.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_003_get.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_003_get.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_003_get.py Fri Feb 25 13:17:11 2022
@@ -1,9 +1,10 @@
import re
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestGet:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_004_post.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_004_post.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_004_post.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_004_post.py Fri Feb 25 13:17:11 2022
@@ -8,9 +8,10 @@ import sys
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestPost:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_005_files.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_005_files.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_005_files.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_005_files.py Fri Feb 25 13:17:11 2022
@@ -1,7 +1,7 @@
import os
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
def mk_text_file(fpath: str, lines: int):
@@ -15,6 +15,7 @@ def mk_text_file(fpath: str, lines: int)
fd.write("\n")
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestFiles:
URI_PATHS = []
Modified: httpd/httpd/trunk/test/modules/http2/test_006_assets.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_006_assets.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_006_assets.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_006_assets.py Fri Feb 25 13:17:11 2022
@@ -1,8 +1,9 @@
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestAssets:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_100_conn_reuse.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_100_conn_reuse.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_100_conn_reuse.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_100_conn_reuse.py Fri Feb 25 13:17:11 2022
@@ -1,8 +1,9 @@
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestConnReuse:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_101_ssl_reneg.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_101_ssl_reneg.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_101_ssl_reneg.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_101_ssl_reneg.py Fri Feb 25 13:17:11 2022
@@ -4,6 +4,7 @@ import pytest
from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(H2TestEnv.get_ssl_module() != "mod_ssl", reason="only for mod_ssl")
class TestSslRenegotiation:
Modified: httpd/httpd/trunk/test/modules/http2/test_102_require.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_102_require.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_102_require.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_102_require.py Fri Feb 25 13:17:11 2022
@@ -1,8 +1,9 @@
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestRequire:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_103_upgrade.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_103_upgrade.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_103_upgrade.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_103_upgrade.py Fri Feb 25 13:17:11 2022
@@ -1,8 +1,9 @@
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestUpgrade:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_104_padding.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_104_padding.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_104_padding.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_104_padding.py Fri Feb 25 13:17:11 2022
@@ -1,6 +1,6 @@
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
def frame_padding(payload, padbits):
@@ -8,6 +8,7 @@ def frame_padding(payload, padbits):
return ((payload + 9 + mask) & ~mask) - (payload + 9)
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestPadding:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_105_timeout.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_105_timeout.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_105_timeout.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_105_timeout.py Fri Feb 25 13:17:11 2022
@@ -3,10 +3,11 @@ import time
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
from pyhttpd.curl import CurlPiper
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestTimeout:
# Check that base servers 'Timeout' setting is observed on SSL handshake
Modified: httpd/httpd/trunk/test/modules/http2/test_106_shutdown.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_106_shutdown.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_106_shutdown.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_106_shutdown.py Fri Feb 25 13:17:11 2022
@@ -7,10 +7,11 @@ from threading import Thread
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
from pyhttpd.result import ExecResult
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestShutdown:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_200_header_invalid.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_200_header_invalid.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_200_header_invalid.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_200_header_invalid.py Fri Feb 25 13:17:11 2022
@@ -1,8 +1,9 @@
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestInvalidHeaders:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_201_header_conditional.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_201_header_conditional.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_201_header_conditional.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_201_header_conditional.py Fri Feb 25 13:17:11 2022
@@ -1,8 +1,9 @@
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestConditionalHeaders:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_202_trailer.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_202_trailer.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_202_trailer.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_202_trailer.py Fri Feb 25 13:17:11 2022
@@ -1,7 +1,7 @@
import os
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
def setup_data(env):
@@ -13,6 +13,7 @@ def setup_data(env):
# The trailer tests depend on "nghttp" as no other client seems to be able to send those
# rare things.
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestTrailers:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_300_interim.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_300_interim.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_300_interim.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_300_interim.py Fri Feb 25 13:17:11 2022
@@ -1,8 +1,9 @@
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestInterimResponses:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_400_push.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_400_push.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_400_push.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_400_push.py Fri Feb 25 13:17:11 2022
@@ -1,10 +1,11 @@
import os
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
# The push tests depend on "nghttp"
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestPush:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_401_early_hints.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_401_early_hints.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_401_early_hints.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_401_early_hints.py Fri Feb 25 13:17:11 2022
@@ -1,9 +1,10 @@
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
# The push tests depend on "nghttp"
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestEarlyHints:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_500_proxy.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_500_proxy.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_500_proxy.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_500_proxy.py Fri Feb 25 13:17:11 2022
@@ -3,9 +3,10 @@ import os
import re
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestProxy:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_501_proxy_serverheader.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_501_proxy_serverheader.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_501_proxy_serverheader.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_501_proxy_serverheader.py Fri Feb 25 13:17:11 2022
@@ -1,8 +1,9 @@
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestProxyServerHeader:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_502_proxy_port.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_502_proxy_port.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_502_proxy_port.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_502_proxy_port.py Fri Feb 25 13:17:11 2022
@@ -1,8 +1,9 @@
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestProxyPort:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_600_h2proxy.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_600_h2proxy.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_600_h2proxy.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_600_h2proxy.py Fri Feb 25 13:17:11 2022
@@ -1,8 +1,9 @@
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestH2Proxy:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_700_load_get.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_700_load_get.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_700_load_get.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_700_load_get.py Fri Feb 25 13:17:11 2022
@@ -3,6 +3,7 @@ import pytest
from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(not H2TestEnv().h2load_is_at_least('1.41.0'),
reason="h2load misses --connect-to option")
class TestLoadGet:
Modified: httpd/httpd/trunk/test/modules/http2/test_710_load_post_static.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_710_load_post_static.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_710_load_post_static.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_710_load_post_static.py Fri Feb 25 13:17:11 2022
@@ -1,9 +1,10 @@
import pytest
import os
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestLoadPostStatic:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_711_load_post_cgi.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_711_load_post_cgi.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_711_load_post_cgi.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_711_load_post_cgi.py Fri Feb 25 13:17:11 2022
@@ -1,9 +1,10 @@
import pytest
import os
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestLoadCgi:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/modules/http2/test_712_buffering.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_712_buffering.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_712_buffering.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_712_buffering.py Fri Feb 25 13:17:11 2022
@@ -2,10 +2,11 @@ from datetime import timedelta
import pytest
-from .env import H2Conf
+from .env import H2Conf, H2TestEnv
from pyhttpd.curl import CurlPiper
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
class TestBuffering:
@pytest.fixture(autouse=True, scope='class')
Modified: httpd/httpd/trunk/test/pyhttpd/env.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/pyhttpd/env.py?rev=1898417&r1=1898416&r2=1898417&view=diff
==============================================================================
--- httpd/httpd/trunk/test/pyhttpd/env.py (original)
+++ httpd/httpd/trunk/test/pyhttpd/env.py Fri Feb 25 13:17:11 2022
@@ -35,6 +35,7 @@ class HttpdTestSetup:
"logio",
"unixd",
"version",
+ "watchdog",
"authn_core",
"authz_host",
"authz_groupfile",