diff options
author | Stefan Eissing <icing@apache.org> | 2023-06-30 10:29:27 +0200 |
---|---|---|
committer | Stefan Eissing <icing@apache.org> | 2023-06-30 10:29:27 +0200 |
commit | f5604a0b59337a1901ccd783ac7a4945d54d0253 (patch) | |
tree | 79bf4a51cf636db71361883bd9b968ecdcd5a9d7 /test | |
parent | tests: sync mod_http2 tests with mod_h2 and 2.4.x version checks (diff) | |
download | apache2-f5604a0b59337a1901ccd783ac7a4945d54d0253.tar.xz apache2-f5604a0b59337a1901ccd783ac7a4945d54d0253.zip |
tests: another sync of the http2 tests
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1910702 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
-rw-r--r-- | test/modules/http2/test_003_get.py | 4 | ||||
-rw-r--r-- | test/modules/http2/test_600_h2proxy.py | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/test/modules/http2/test_003_get.py b/test/modules/http2/test_003_get.py index 57c3775bfd..572c4fb702 100644 --- a/test/modules/http2/test_003_get.py +++ b/test/modules/http2/test_003_get.py @@ -251,8 +251,6 @@ content-type: text/html # produce an error during response body def test_h2_003_71(self, env, repeat): - if env.httpd_is_at_least('2.5.0'): - pytest.skip("needs fix in core protocol handling") url = env.mkurl("https", "cgi", "/h2test/error?body_error=timeout") r = env.curl_get(url) assert r.exit_code != 0, f"{r}" @@ -262,8 +260,6 @@ content-type: text/html # produce an error, fail to generate an error bucket def test_h2_003_72(self, env, repeat): - if env.httpd_is_at_least('2.5.0'): - pytest.skip("needs fix in core protocol handling") url = env.mkurl("https", "cgi", "/h2test/error?body_error=timeout&error_bucket=0") r = env.curl_get(url) assert r.exit_code != 0, f"{r}" diff --git a/test/modules/http2/test_600_h2proxy.py b/test/modules/http2/test_600_h2proxy.py index 4f071cc437..48c6f7493a 100644 --- a/test/modules/http2/test_600_h2proxy.py +++ b/test/modules/http2/test_600_h2proxy.py @@ -153,8 +153,6 @@ class TestH2Proxy: # produce an error during response body def test_h2_600_31(self, env, repeat): - if env.httpd_is_at_least('2.5.0'): - pytest.skip("needs fix in core protocol handling") conf = H2Conf(env) conf.add_vhost_cgi(h2proxy_self=True) conf.install() @@ -168,8 +166,6 @@ class TestH2Proxy: # produce an error, fail to generate an error bucket def test_h2_600_32(self, env, repeat): - if env.httpd_is_at_least('2.5.0'): - pytest.skip("needs fix in core protocol handling") conf = H2Conf(env) conf.add_vhost_cgi(h2proxy_self=True) conf.install() @@ -179,4 +175,4 @@ class TestH2Proxy: # depending on when the error is detect in proxying, if may RST the # stream (exit_code != 0) or give a 503 response. if r.exit_code == 0: - assert r.response['status'] == 503 + assert r.response['status'] in [502, 503] |