modern python fixes:

- rename hook parameter, because python thought this is a super good idea
- change call property to method because it no longer worked

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933904 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/conftest.py b/test/conftest.py
index ac0a7c553d86cd18a65c711a8ea6724c92544c8e..390a33bec5d39a68c397f2280974999a0b3e99ad 100644 (file)
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -7,7 +7,7 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '.'))
 
 from pyhttpd.env import HttpdTestEnv
 
-def pytest_report_header(config, startdir):
+def pytest_report_header(config, start_path):
     env = HttpdTestEnv()
     return f"[apache httpd: {env.get_httpd_version()}, mpm: {env.mpm_module}, {env.prefix}]"
 

diff --git a/test/modules/core/conftest.py b/test/modules/core/conftest.py
index a14bdfb6752d28d529b14c1e9ae6ab0ec76f496f..72c52fa9fa09a7055bb9adbdd9b8891897a7037a 100644 (file)
--- a/test/modules/core/conftest.py
+++ b/test/modules/core/conftest.py
@@ -10,7 +10,7 @@ from pyhttpd.env import HttpdTestEnv
 sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
 
 
-def pytest_report_header(config, startdir):
+def pytest_report_header(config, start_path):
     env = CoreTestEnv()
     return f"core [apache: {env.get_httpd_version()}, mpm: {env.mpm_module}, {env.prefix}]"
 

diff --git a/test/modules/http1/conftest.py b/test/modules/http1/conftest.py
index 45b26c1796f226d25a56f7bf7521f170d4970402..be3d76aa0df2396d0ce951ffa1644559c339fb36 100644 (file)
--- a/test/modules/http1/conftest.py
+++ b/test/modules/http1/conftest.py
@@ -9,7 +9,7 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
 from .env import H1TestEnv
 
 
-def pytest_report_header(config, startdir):
+def pytest_report_header(config, start_path):
     env = H1TestEnv()
     return f"mod_http [apache: {env.get_httpd_version()}, mpm: {env.mpm_module}, {env.prefix}]"
 

diff --git a/test/modules/http2/conftest.py b/test/modules/http2/conftest.py
index 118cef1a9501578826e2afefece306c67d4a563d..90cd6a7c853cce182d05b6062e643c463b9023ab 100644 (file)
--- a/test/modules/http2/conftest.py
+++ b/test/modules/http2/conftest.py
@@ -9,7 +9,7 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
 from .env import H2TestEnv
 
 
-def pytest_report_header(config, startdir):
+def pytest_report_header(config, start_path):
     env = H2TestEnv()
     return f"mod_h2 [apache: {env.get_httpd_version()}, mpm: {env.mpm_module}, {env.prefix}]"
 

diff --git a/test/modules/http2/env.py b/test/modules/http2/env.py
index b2443e003b658fc3207587934492ae1918f6c5eb..e2647616aaff67140a96919038e86a5a126dd3dd 100644 (file)
--- a/test/modules/http2/env.py
+++ b/test/modules/http2/env.py
@@ -64,7 +64,6 @@ class H2TestSetup(HttpdTestSetup):
 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'

diff --git a/test/modules/http2/test_001_httpd_alive.py b/test/modules/http2/test_001_httpd_alive.py
index b5708d2813489f159f1d2e1f3783d84a627e3e5d..d81269594c12bd4771bc3aedae005ec0eaf35cd8 100644 (file)
--- a/test/modules/http2/test_001_httpd_alive.py
+++ b/test/modules/http2/test_001_httpd_alive.py
@@ -3,7 +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(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
 class TestBasicAlive:
 
     @pytest.fixture(autouse=True, scope='class')

diff --git a/test/modules/http2/test_002_curl_basics.py b/test/modules/http2/test_002_curl_basics.py
index 91be772114e0ce6d2f68ca2da39983c544220ab3..2c8886ddec4573412baa2f30bf66707fa531a963 100644 (file)
--- a/test/modules/http2/test_002_curl_basics.py
+++ b/test/modules/http2/test_002_curl_basics.py
@@ -3,7 +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(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
 class TestCurlBasics:
 
     @pytest.fixture(autouse=True, scope='class')

diff --git a/test/modules/http2/test_003_get.py b/test/modules/http2/test_003_get.py
index 572c4fb702304972c889fbab411d104591943ef2..80edefbb7bae2f5765aa79d97e7d1c391b489a95 100644 (file)
--- a/test/modules/http2/test_003_get.py
+++ b/test/modules/http2/test_003_get.py
@@ -4,7 +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(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
 class TestGet:
 
     @pytest.fixture(autouse=True, scope='class')

diff --git a/test/modules/http2/test_004_post.py b/test/modules/http2/test_004_post.py
index 295f989b88ec36a034251e5bb4c622740c3a3f85..3edb218e7c39529fc041036582e1fcc9aa2d537b 100644 (file)
--- a/test/modules/http2/test_004_post.py
+++ b/test/modules/http2/test_004_post.py
@@ -12,7 +12,7 @@ import pytest
 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')

diff --git a/test/modules/http2/test_005_files.py b/test/modules/http2/test_005_files.py
index e7618362c529885c922a9ec45a29b16d10ac4619..40abbf659a80a8b53dea6bd2a1f9216aa42dcd44 100644 (file)
--- a/test/modules/http2/test_005_files.py
+++ b/test/modules/http2/test_005_files.py
@@ -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 = []

diff --git a/test/modules/http2/test_006_assets.py b/test/modules/http2/test_006_assets.py
index 778314eda023729600e73193fee42d5f6c829b86..d02e8dc4b2dfee46de372295a6e5eac7b23bcdfa 100644 (file)
--- a/test/modules/http2/test_006_assets.py
+++ b/test/modules/http2/test_006_assets.py
@@ -3,7 +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(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
 class TestAssets:
 
     @pytest.fixture(autouse=True, scope='class')

diff --git a/test/modules/http2/test_007_ssi.py b/test/modules/http2/test_007_ssi.py
index f5411bccd4371f08509b3d2d92729bbd24ad387b..1da48ff45460b4a771180199308a4e2770208ea0 100644 (file)
--- a/test/modules/http2/test_007_ssi.py
+++ b/test/modules/http2/test_007_ssi.py
@@ -3,7 +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(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
 class TestSSI:
 
     @pytest.fixture(autouse=True, scope='class')

diff --git a/test/modules/http2/test_008_ranges.py b/test/modules/http2/test_008_ranges.py
index dd695bb08d1ec0a03369a91fc8c0f90dab2c45b0..53664e1db442d037e3ca8aee5c462c75b1c5013b 100644 (file)
--- a/test/modules/http2/test_008_ranges.py
+++ b/test/modules/http2/test_008_ranges.py
@@ -11,7 +11,7 @@ from .env import H2Conf, H2TestEnv
 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 = ""

diff --git a/test/modules/http2/test_009_timing.py b/test/modules/http2/test_009_timing.py
index 2784f9ad35a8d9579031accb0d574238ab46a714..94895cc35fe3c2fe5800c7ff32510bb1ed558845 100644 (file)
--- a/test/modules/http2/test_009_timing.py
+++ b/test/modules/http2/test_009_timing.py
@@ -6,7 +6,7 @@ import pytest
 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:
 

diff --git a/test/modules/http2/test_100_conn_reuse.py b/test/modules/http2/test_100_conn_reuse.py
index 103166fa3019d6077ccf9e1794f8ef3640bf40fc..ed958eb28498cf7c7f9416bbaef968c00a121707 100644 (file)
--- a/test/modules/http2/test_100_conn_reuse.py
+++ b/test/modules/http2/test_100_conn_reuse.py
@@ -3,7 +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(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
 class TestConnReuse:
 
     @pytest.fixture(autouse=True, scope='class')

diff --git a/test/modules/http2/test_101_ssl_reneg.py b/test/modules/http2/test_101_ssl_reneg.py
index d278af21ed456bc8d8fb5f54f1e0f5f1da252bc7..7bd10f5555fd669b25e2202285576c8813a9ba78 100644 (file)
--- a/test/modules/http2/test_101_ssl_reneg.py
+++ b/test/modules/http2/test_101_ssl_reneg.py
@@ -4,7 +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(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:
 

diff --git a/test/modules/http2/test_102_require.py b/test/modules/http2/test_102_require.py
index 4b0cad56a248a7c970348046ebba5370a912bdaa..e97fb19ce50824016ed2d7bac427749ac9a5b091 100644 (file)
--- a/test/modules/http2/test_102_require.py
+++ b/test/modules/http2/test_102_require.py
@@ -3,7 +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(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
 class TestRequire:
 
     @pytest.fixture(autouse=True, scope='class')

diff --git a/test/modules/http2/test_103_upgrade.py b/test/modules/http2/test_103_upgrade.py
index 1542450df9371b02f1e3529027ed027f7fda7d2f..b04aca42097d0b6b29fdd934bea03efd5f20fc1e 100644 (file)
--- a/test/modules/http2/test_103_upgrade.py
+++ b/test/modules/http2/test_103_upgrade.py
@@ -3,7 +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(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
 class TestUpgrade:
 
     @pytest.fixture(autouse=True, scope='class')

diff --git a/test/modules/http2/test_104_padding.py b/test/modules/http2/test_104_padding.py
index 401804ade8611e7934aa69b01bee9e6a10d03b49..35a5ba32fc1470b21a1516c9a35739ee593bdf11 100644 (file)
--- a/test/modules/http2/test_104_padding.py
+++ b/test/modules/http2/test_104_padding.py
@@ -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')

diff --git a/test/modules/http2/test_106_shutdown.py b/test/modules/http2/test_106_shutdown.py
index fab881bcac76cf22544aa10aac674b647e0a30ae..33fe5adfdad6ed8aff73b2ccf432937d3a820f07 100644 (file)
--- a/test/modules/http2/test_106_shutdown.py
+++ b/test/modules/http2/test_106_shutdown.py
@@ -11,7 +11,7 @@ from .env import H2Conf, H2TestEnv
 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')

diff --git a/test/modules/http2/test_107_frame_lengths.py b/test/modules/http2/test_107_frame_lengths.py
index d6360939bea0a0516ed7730a4d156d34f26047af..ac855450e0177a6d7b8f2ab336a5392c6c4442a6 100644 (file)
--- a/test/modules/http2/test_107_frame_lengths.py
+++ b/test/modules/http2/test_107_frame_lengths.py
@@ -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 = []

diff --git a/test/modules/http2/test_200_header_invalid.py b/test/modules/http2/test_200_header_invalid.py
index 1687e3d981890c9515b720b6dd0b2ebb15c409bc..adb203b5b6b55bd2854acd1356a1f54dd3936e9c 100644 (file)
--- a/test/modules/http2/test_200_header_invalid.py
+++ b/test/modules/http2/test_200_header_invalid.py
@@ -4,7 +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(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
 class TestInvalidHeaders:
 
     @pytest.fixture(autouse=True, scope='class')

diff --git a/test/modules/http2/test_201_header_conditional.py b/test/modules/http2/test_201_header_conditional.py
index f1032683bf4ee85f497b9e4b4f10f01ea782a6ae..a7dbe7a6dccd46de25bc2be5eee2e497aca32313 100644 (file)
--- a/test/modules/http2/test_201_header_conditional.py
+++ b/test/modules/http2/test_201_header_conditional.py
@@ -3,7 +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(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
 class TestConditionalHeaders:
 
     @pytest.fixture(autouse=True, scope='class')

diff --git a/test/modules/http2/test_202_trailer.py b/test/modules/http2/test_202_trailer.py
index 6c4e05d3d99b189580e24e331b33305fcd5e1925..caef900097f0be62cdc89b210dd01f816fb0ffdb 100644 (file)
--- a/test/modules/http2/test_202_trailer.py
+++ b/test/modules/http2/test_202_trailer.py
@@ -13,7 +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")
+@pytest.mark.skipif(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
 class TestTrailers:
 
     @pytest.fixture(autouse=True, scope='class')

diff --git a/test/modules/http2/test_203_rfc9113.py b/test/modules/http2/test_203_rfc9113.py
index 143c0fc930df881063c97af99d3613c7f410b392..b1a6d02a5de87007401c57fb6dcf8d579876c548 100644 (file)
--- a/test/modules/http2/test_203_rfc9113.py
+++ b/test/modules/http2/test_203_rfc9113.py
@@ -5,7 +5,7 @@ from pyhttpd.env import HttpdTestEnv
 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 TestRfc9113:
 
     @pytest.fixture(autouse=True, scope='class')

diff --git a/test/modules/http2/test_300_interim.py b/test/modules/http2/test_300_interim.py
index 774ab88a061eeaacc7e664b3097b9c4e2fee7cf8..efe777a258def901b4f09349a675f96dcc18b9c0 100644 (file)
--- a/test/modules/http2/test_300_interim.py
+++ b/test/modules/http2/test_300_interim.py
@@ -3,7 +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(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
 class TestInterimResponses:
 
     @pytest.fixture(autouse=True, scope='class')

diff --git a/test/modules/http2/test_400_push.py b/test/modules/http2/test_400_push.py
index 9c61608d87136bd1b92be6fa4283caa53eb148b8..1cd2a6ad77d3bff49bdc2555536e392a7cb32b87 100644 (file)
--- a/test/modules/http2/test_400_push.py
+++ b/test/modules/http2/test_400_push.py
@@ -5,7 +5,7 @@ from .env import H2Conf, H2TestEnv
 
 
 # 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')

diff --git a/test/modules/http2/test_401_early_hints.py b/test/modules/http2/test_401_early_hints.py
index 57043052c2c4fc600449254e8fd5226257fed4b9..4c1f61ba5bab6adc3b6a5bfbff720aecd234ebda 100644 (file)
--- a/test/modules/http2/test_401_early_hints.py
+++ b/test/modules/http2/test_401_early_hints.py
@@ -4,7 +4,7 @@ from .env import H2Conf, H2TestEnv
 
 
 # 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')

diff --git a/test/modules/http2/test_500_proxy.py b/test/modules/http2/test_500_proxy.py
index 87e523c4a21f581ac36dc5770171b7b085645b63..cca286aa3f71e0f78a36f80ac56f0020a011be02 100644 (file)
--- a/test/modules/http2/test_500_proxy.py
+++ b/test/modules/http2/test_500_proxy.py
@@ -6,7 +6,7 @@ import pytest
 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')

diff --git a/test/modules/http2/test_501_proxy_serverheader.py b/test/modules/http2/test_501_proxy_serverheader.py
index 0d7c18890056585f68802de592f919e4dfb220e1..fab22b90d926610098541aad6e427d810ef4c343 100644 (file)
--- a/test/modules/http2/test_501_proxy_serverheader.py
+++ b/test/modules/http2/test_501_proxy_serverheader.py
@@ -3,7 +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(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
 class TestProxyServerHeader:
 
     @pytest.fixture(autouse=True, scope='class')

diff --git a/test/modules/http2/test_502_proxy_port.py b/test/modules/http2/test_502_proxy_port.py
index f6c6db156fb39bfe4ec97a332f9f2675a623b921..3bbe75943aeada000390ea2fcb5a779cf139020f 100644 (file)
--- a/test/modules/http2/test_502_proxy_port.py
+++ b/test/modules/http2/test_502_proxy_port.py
@@ -3,7 +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(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
 class TestProxyPort:
 
     @pytest.fixture(autouse=True, scope='class')

diff --git a/test/modules/http2/test_503_proxy_fwd.py b/test/modules/http2/test_503_proxy_fwd.py
index 478a52d08c91a2e0984550fe71e1b38778980c75..e007325f7ef4ca82687e565db8ad96768ccd159a 100644 (file)
--- a/test/modules/http2/test_503_proxy_fwd.py
+++ b/test/modules/http2/test_503_proxy_fwd.py
@@ -3,7 +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(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
 class TestProxyFwd:
 
     @classmethod

diff --git a/test/modules/http2/test_600_h2proxy.py b/test/modules/http2/test_600_h2proxy.py
index 18a528e9c959aeef8c9a4c306847295123473822..0f69ea741d0c1a186e102067cbb6ad14d3c5912b 100644 (file)
--- a/test/modules/http2/test_600_h2proxy.py
+++ b/test/modules/http2/test_600_h2proxy.py
@@ -3,7 +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(condition=H2TestEnv.is_unsupported(), reason="mod_http2 not supported here")
 class TestH2Proxy:
 
     def test_h2_600_01(self, env):

diff --git a/test/modules/http2/test_601_h2proxy_twisted.py b/test/modules/http2/test_601_h2proxy_twisted.py
index 60f5f7df5bfdf3081968c544f07aa530017fbfb0..52aaa09d5432d5fee1db97bb776bfb4568e35a22 100644 (file)
--- a/test/modules/http2/test_601_h2proxy_twisted.py
+++ b/test/modules/http2/test_601_h2proxy_twisted.py
@@ -9,7 +9,7 @@ from .env import H2Conf, H2TestEnv
 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')

diff --git a/test/modules/http2/test_700_load_get.py b/test/modules/http2/test_700_load_get.py
index 138e74ce8588e7f5b63f46c06a202c25cae01e66..b5a6b73cb726a8d0bd1ddb2005aee219b8909b50 100644 (file)
--- a/test/modules/http2/test_700_load_get.py
+++ b/test/modules/http2/test_700_load_get.py
@@ -3,7 +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(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:

diff --git a/test/modules/http2/test_710_load_post_static.py b/test/modules/http2/test_710_load_post_static.py
index ad8ae96aefd07d4d00e96822338b5f73ec9ce41f..2eb606bf4a8e97f053abf86cbd219ecde8d07278 100644 (file)
--- a/test/modules/http2/test_710_load_post_static.py
+++ b/test/modules/http2/test_710_load_post_static.py
@@ -4,7 +4,7 @@ import os
 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')

diff --git a/test/modules/http2/test_711_load_post_cgi.py b/test/modules/http2/test_711_load_post_cgi.py
index 82529d17644bfc4a44301536b050f2455be030e1..f2ff19b83b3093fad98bb325acd6b3304a0d902d 100644 (file)
--- a/test/modules/http2/test_711_load_post_cgi.py
+++ b/test/modules/http2/test_711_load_post_cgi.py
@@ -4,7 +4,7 @@ import os
 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')

diff --git a/test/modules/http2/test_712_buffering.py b/test/modules/http2/test_712_buffering.py
index 0a6978b42773d835958e8ab28e06dac25ba34594..89053e35d68aa4a6138ff993a235d26e18d2e6bd 100644 (file)
--- a/test/modules/http2/test_712_buffering.py
+++ b/test/modules/http2/test_712_buffering.py
@@ -6,7 +6,7 @@ from .env import H2Conf, H2TestEnv
 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')

diff --git a/test/modules/http2/test_800_websockets.py b/test/modules/http2/test_800_websockets.py
index c0fc0c23dcb3ad593e170e7988139e3523d96683..5c49ded65656af161fe2f142b9c22dc5436b028f 100644 (file)
--- a/test/modules/http2/test_800_websockets.py
+++ b/test/modules/http2/test_800_websockets.py
@@ -83,7 +83,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,

diff --git a/test/modules/proxy/conftest.py b/test/modules/proxy/conftest.py
index c92e363e2a5a8ca96aac0625b891211618c880e2..cdc779f00f448e02725f63cf109045d9c61a9ad9 100644 (file)
--- a/test/modules/proxy/conftest.py
+++ b/test/modules/proxy/conftest.py
@@ -8,7 +8,7 @@ from .env import ProxyTestEnv
 sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
 
 
-def pytest_report_header(config, startdir):
+def pytest_report_header(config, start_path):
     env = ProxyTestEnv()
     return "mod_proxy: [apache: {aversion}({prefix})]".format(
         prefix=env.prefix,