Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion test/modules/http2/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ def _setup_data_1k_1m(self):
class H2TestEnv(HttpdTestEnv):

@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'
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_001_httpd_alive.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestBasicAlive:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_002_curl_basics.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestCurlBasics:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_003_get.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

log = logging.getLogger(__name__)

@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestGet:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_004_post.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestPost:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_005_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +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")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestFiles:

URI_PATHS = []
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_006_assets.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestAssets:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_007_ssi.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestSSI:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_008_ranges.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
log = logging.getLogger(__name__)


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestRanges:

LOGFILE = ""
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_009_timing.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@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 TestTiming:

Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_100_conn_reuse.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestConnReuse:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_101_ssl_reneg.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@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:

Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_102_require.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestRequire:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_103_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestUpgrade:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_104_padding.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +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")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestPadding:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_106_shutdown.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from pyhttpd.result import ExecResult


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestShutdown:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_107_frame_lengths.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +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")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestFrameLengths:

URI_PATHS = []
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_200_header_invalid.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
log = logging.getLogger(__name__)


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestInvalidHeaders:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_201_header_conditional.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestConditionalHeaders:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_300_interim.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestInterimResponses:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_400_push.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


# The push tests depend on "nghttp"
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestPush:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_401_early_hints.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


# The push tests depend on "nghttp"
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestEarlyHints:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_500_proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestProxy:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_501_proxy_serverheader.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestProxyServerHeader:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_502_proxy_port.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestProxyPort:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_503_proxy_fwd.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestProxyFwd:

@classmethod
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_600_h2proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestH2Proxy:

def test_h2_600_01(self, env):
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_601_h2proxy_twisted.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
log = logging.getLogger(__name__)


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestH2ProxyTwisted:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_700_load_get.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@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:
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_710_load_post_static.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestLoadPostStatic:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_711_load_post_cgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from .env import H2Conf, H2TestEnv


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestLoadCgi:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_712_buffering.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from pyhttpd.curl import CurlPiper


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
class TestBuffering:

@pytest.fixture(autouse=True, scope='class')
Expand Down
2 changes: 1 addition & 1 deletion test/modules/http2/test_800_websockets.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def ws_run(env: H2TestEnv, path, authority=None, do_input=None, inbytes=None,
stdout=b'', stderr=b'', duration=end - start), infos, frames


@pytest.mark.skipif(condition=H2TestEnv.is_unsupported, reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
@pytest.mark.skipif(condition=not H2TestEnv().httpd_is_at_least("2.4.60"),
reason=f'need at least httpd 2.4.60 for this')
@pytest.mark.skipif(condition=ws_version < ws_version_min,
Expand Down