cf-setup: improve readability

Restructure the code in cf-setup connect to make it better readable what
is happening for establishing the connection's filter chain.

Closes #21827
This commit is contained in:
Stefan Eissing 2026-06-01 14:23:30 +02:00 committed by Daniel Stenberg
parent c53426231d
commit 032b15c434
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
4 changed files with 238 additions and 178 deletions

View file

@ -195,12 +195,12 @@ class TestH3Proxy:
@pytest.mark.parametrize(
["alpn_proto", "proxy_proto", "exp_err"],
[
#pytest.param(
# "http/1.1",
# "h3",
# "could not connect to server",
# id="fail_h1_over_h3_proxytunnel",
#),
pytest.param(
"http/1.1",
"h3",
"could not connect to server",
id="fail_h1_over_h3_proxytunnel",
),
pytest.param(
"h2",
"h3",
@ -208,12 +208,12 @@ class TestH3Proxy:
marks=MARK_NEEDS_NGHTTP2,
id="fail_h2_over_h3_proxytunnel",
),
#pytest.param(
# "h3",
# "h3",
# "could not connect to server",
# id="fail_h3_over_h3_proxytunnel",
#),
pytest.param(
"h3",
"h3",
"could not connect to server",
id="fail_h3_over_h3_proxytunnel",
),
#pytest.param(
# "h3",
# "h2",
@ -235,11 +235,13 @@ class TestH3Proxy:
httpd,
nghttpx,
nghttpx_fwd,
h2o_proxy,
alpn_proto,
proxy_proto,
exp_err,
):
_require_available(httpd=httpd, nghttpx=nghttpx, nghttpx_fwd=nghttpx_fwd)
_require_available(httpd=httpd, nghttpx=nghttpx, nghttpx_fwd=nghttpx_fwd,
h2o_proxy=h2o_proxy)
curl = CurlClient(env=env)
url = f"https://localhost:{env.https_port}/data.json"