diff options
| author | Stefan Eissing <icing@apache.org> | 2023-05-03 08:21:47 +0000 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2023-05-03 08:21:47 +0000 |
| commit | 525dc658b7baf471a9790a4d24537b2efc25363c (patch) | |
| tree | b5516b58d8e7670491ffbb3e70af532c3a993fa7 /test/modules/http2/test_600_h2proxy.py | |
| parent | cb6fbeb6db4d83b855d98a9d98b26269365d3849 (diff) | |
| download | httpd-525dc658b7baf471a9790a4d24537b2efc25363c.tar.gz | |
tests, synching changes/additions from trunk in http2 tests
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909587 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/modules/http2/test_600_h2proxy.py')
| -rw-r--r-- | test/modules/http2/test_600_h2proxy.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/modules/http2/test_600_h2proxy.py b/test/modules/http2/test_600_h2proxy.py index e93ba1ae51..d6f1452730 100644 --- a/test/modules/http2/test_600_h2proxy.py +++ b/test/modules/http2/test_600_h2proxy.py @@ -78,7 +78,8 @@ class TestH2Proxy: conf.install() assert env.apache_restart() == 0 url = env.mkurl("https", "cgi", f"/h2proxy/{env.http_port}/hello.py") - if enable_reuse == "on": + # httpd 2.5.0 disables reuse, not matter the config + if enable_reuse == "on" and not env.httpd_is_at_least("2.5.0"): # reuse is not guaranteed for each request, but we expect some # to do it and run on a h2 stream id > 1 reused = False @@ -130,7 +131,9 @@ class TestH2Proxy: assert r.response["previous"]["status"] == 200 assert int(r.json[0]["port"]) == env.http_port assert r.response["status"] == 200 - exp_port = env.http_port if enable_reuse == "on" else env.http_port2 + exp_port = env.http_port if enable_reuse == "on" \ + and not env.httpd_is_at_least("2.5.0")\ + else env.http_port2 assert int(r.json[1]["port"]) == exp_port # lets do some error tests @@ -150,6 +153,7 @@ class TestH2Proxy: # produce an error during response body def test_h2_600_31(self, env, repeat): + pytest.skip("needs fix in core protocol handling") conf = H2Conf(env) conf.add_vhost_cgi(h2proxy_self=True) conf.install() @@ -163,6 +167,7 @@ class TestH2Proxy: # produce an error, fail to generate an error bucket def test_h2_600_32(self, env, repeat): + pytest.skip("needs fix in core protocol handling") conf = H2Conf(env) conf.add_vhost_cgi(h2proxy_self=True) conf.install() |