black formatting

This commit is contained in:
James Fuller 2025-02-09 17:29:30 +01:00
parent d7333c2bed
commit 53336d9e0b
No known key found for this signature in database
GPG key ID: 62A7A992CAF66B84
36 changed files with 4737 additions and 3515 deletions

View file

@ -1,6 +1,6 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#***************************************************************************
# ***************************************************************************
# _ _ ____ _
# Project ___| | | | _ \| |
# / __| | | | |_) | |
@ -35,8 +35,7 @@ log = logging.getLogger(__name__)
class TestBasic:
@pytest.fixture(autouse=True, scope='class')
@pytest.fixture(autouse=True, scope="class")
def _class_scope(self, env, nghttpx):
if env.have_h3():
nghttpx.start_if_needed()
@ -44,108 +43,116 @@ class TestBasic:
# simple http: GET
def test_01_01_http_get(self, env: Env, httpd):
curl = CurlClient(env=env)
url = f'http://{env.domain1}:{env.http_port}/data.json'
url = f"http://{env.domain1}:{env.http_port}/data.json"
r = curl.http_get(url=url)
r.check_response(http_status=200)
assert r.json['server'] == env.domain1
assert r.json["server"] == env.domain1
# simple https: GET, any http version
@pytest.mark.skipif(condition=not Env.have_ssl_curl(), reason="curl without SSL")
def test_01_02_https_get(self, env: Env, httpd):
curl = CurlClient(env=env)
url = f'https://{env.domain1}:{env.https_port}/data.json'
url = f"https://{env.domain1}:{env.https_port}/data.json"
r = curl.http_get(url=url)
r.check_response(http_status=200)
assert r.json['server'] == env.domain1
assert r.json["server"] == env.domain1
# simple https: GET, h2 wanted and got
@pytest.mark.skipif(condition=not Env.have_ssl_curl(), reason="curl without SSL")
def test_01_03_h2_get(self, env: Env, httpd):
curl = CurlClient(env=env)
url = f'https://{env.domain1}:{env.https_port}/data.json'
r = curl.http_get(url=url, extra_args=['--http2'])
r.check_response(http_status=200, protocol='HTTP/2')
assert r.json['server'] == env.domain1
url = f"https://{env.domain1}:{env.https_port}/data.json"
r = curl.http_get(url=url, extra_args=["--http2"])
r.check_response(http_status=200, protocol="HTTP/2")
assert r.json["server"] == env.domain1
# simple https: GET, h2 unsupported, fallback to h1
@pytest.mark.skipif(condition=not Env.have_ssl_curl(), reason="curl without SSL")
def test_01_04_h2_unsupported(self, env: Env, httpd):
curl = CurlClient(env=env)
url = f'https://{env.domain2}:{env.https_port}/data.json'
r = curl.http_get(url=url, extra_args=['--http2'])
r.check_response(http_status=200, protocol='HTTP/1.1')
assert r.json['server'] == env.domain2
url = f"https://{env.domain2}:{env.https_port}/data.json"
r = curl.http_get(url=url, extra_args=["--http2"])
r.check_response(http_status=200, protocol="HTTP/1.1")
assert r.json["server"] == env.domain2
# simple h3: GET, want h3 and get it
@pytest.mark.skipif(condition=not Env.have_h3(), reason="h3 not supported")
def test_01_05_h3_get(self, env: Env, httpd, nghttpx):
curl = CurlClient(env=env)
url = f'https://{env.domain1}:{env.h3_port}/data.json'
r = curl.http_get(url=url, extra_args=['--http3-only'])
r.check_response(http_status=200, protocol='HTTP/3')
assert r.json['server'] == env.domain1
url = f"https://{env.domain1}:{env.h3_port}/data.json"
r = curl.http_get(url=url, extra_args=["--http3-only"])
r.check_response(http_status=200, protocol="HTTP/3")
assert r.json["server"] == env.domain1
# simple download, check connect/handshake timings
@pytest.mark.skipif(condition=not Env.have_ssl_curl(), reason="curl without SSL")
@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
@pytest.mark.parametrize("proto", ["http/1.1", "h2", "h3"])
def test_01_06_timings(self, env: Env, httpd, nghttpx, proto):
if proto == 'h3' and not env.have_h3():
if proto == "h3" and not env.have_h3():
pytest.skip("h3 not supported")
curl = CurlClient(env=env)
url = f'https://{env.authority_for(env.domain1, proto)}/data.json'
url = f"https://{env.authority_for(env.domain1, proto)}/data.json"
r = curl.http_download(urls=[url], alpn_proto=proto, with_stats=True)
r.check_stats(http_status=200, count=1,
remote_port=env.port_for(alpn_proto=proto),
remote_ip='127.0.0.1')
assert r.stats[0]['time_connect'] > 0, f'{r.stats[0]}'
assert r.stats[0]['time_appconnect'] > 0, f'{r.stats[0]}'
r.check_stats(
http_status=200,
count=1,
remote_port=env.port_for(alpn_proto=proto),
remote_ip="127.0.0.1",
)
assert r.stats[0]["time_connect"] > 0, f"{r.stats[0]}"
assert r.stats[0]["time_appconnect"] > 0, f"{r.stats[0]}"
# simple https: HEAD
@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
@pytest.mark.parametrize("proto", ["http/1.1", "h2", "h3"])
@pytest.mark.skipif(condition=not Env.have_ssl_curl(), reason="curl without SSL")
def test_01_07_head(self, env: Env, httpd, nghttpx, proto):
if proto == 'h3' and not env.have_h3():
if proto == "h3" and not env.have_h3():
pytest.skip("h3 not supported")
curl = CurlClient(env=env)
url = f'https://{env.authority_for(env.domain1, proto)}/data.json'
r = curl.http_download(urls=[url], with_stats=True, with_headers=True,
extra_args=['-I'])
r.check_stats(http_status=200, count=1, exitcode=0,
remote_port=env.port_for(alpn_proto=proto),
remote_ip='127.0.0.1')
url = f"https://{env.authority_for(env.domain1, proto)}/data.json"
r = curl.http_download(
urls=[url], with_stats=True, with_headers=True, extra_args=["-I"]
)
r.check_stats(
http_status=200,
count=1,
exitcode=0,
remote_port=env.port_for(alpn_proto=proto),
remote_ip="127.0.0.1",
)
# got the Conten-Length: header, but did not download anything
assert r.responses[0]['header']['content-length'] == '30', f'{r.responses[0]}'
assert r.stats[0]['size_download'] == 0, f'{r.stats[0]}'
assert r.responses[0]["header"]["content-length"] == "30", f"{r.responses[0]}"
assert r.stats[0]["size_download"] == 0, f"{r.stats[0]}"
# http: GET for HTTP/2, see Upgrade:, 101 switch
def test_01_08_h2_upgrade(self, env: Env, httpd):
curl = CurlClient(env=env)
url = f'http://{env.domain1}:{env.http_port}/data.json'
r = curl.http_get(url=url, extra_args=['--http2'])
url = f"http://{env.domain1}:{env.http_port}/data.json"
r = curl.http_get(url=url, extra_args=["--http2"])
r.check_exit_code(0)
assert len(r.responses) == 2, f'{r.responses}'
assert r.responses[0]['status'] == 101, f'{r.responses[0]}'
assert r.responses[1]['status'] == 200, f'{r.responses[1]}'
assert r.responses[1]['protocol'] == 'HTTP/2', f'{r.responses[1]}'
assert r.json['server'] == env.domain1
assert len(r.responses) == 2, f"{r.responses}"
assert r.responses[0]["status"] == 101, f"{r.responses[0]}"
assert r.responses[1]["status"] == 200, f"{r.responses[1]}"
assert r.responses[1]["protocol"] == "HTTP/2", f"{r.responses[1]}"
assert r.json["server"] == env.domain1
# http: GET for HTTP/2 with prior knowledge
def test_01_09_h2_prior_knowledge(self, env: Env, httpd):
curl = CurlClient(env=env)
url = f'http://{env.domain1}:{env.http_port}/data.json'
r = curl.http_get(url=url, extra_args=['--http2-prior-knowledge'])
url = f"http://{env.domain1}:{env.http_port}/data.json"
r = curl.http_get(url=url, extra_args=["--http2-prior-knowledge"])
r.check_exit_code(0)
assert len(r.responses) == 1, f'{r.responses}'
assert r.response['status'] == 200, f'{r.responsw}'
assert r.response['protocol'] == 'HTTP/2', f'{r.response}'
assert r.json['server'] == env.domain1
assert len(r.responses) == 1, f"{r.responses}"
assert r.response["status"] == 200, f"{r.responsw}"
assert r.response["protocol"] == "HTTP/2", f"{r.response}"
assert r.json["server"] == env.domain1
# http: strip TE header in HTTP/2 requests
def test_01_10_te_strip(self, env: Env, httpd):
curl = CurlClient(env=env)
url = f'https://{env.authority_for(env.domain1, "h2")}/data.json'
r = curl.http_get(url=url, extra_args=['--http2', '-H', 'TE: gzip'])
r = curl.http_get(url=url, extra_args=["--http2", "-H", "TE: gzip"])
r.check_exit_code(0)
assert len(r.responses) == 1, f'{r.responses}'
assert r.responses[0]['status'] == 200, f'{r.responses[1]}'
assert r.responses[0]['protocol'] == 'HTTP/2', f'{r.responses[1]}'
assert len(r.responses) == 1, f"{r.responses}"
assert r.responses[0]["status"] == 200, f"{r.responses[1]}"
assert r.responses[0]["protocol"] == "HTTP/2", f"{r.responses[1]}"