mirror of
https://github.com/curl/curl.git
synced 2026-08-06 02:56:15 +03:00
black formatting
This commit is contained in:
James Fuller
parent
d7333c2bed
commit
53336d9e0b
36 changed files with 4737 additions and 3515 deletions
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
#***************************************************************************
|
||||
# ***************************************************************************
|
||||
# _ _ ____ _
|
||||
# Project ___| | | | _ \| |
|
||||
# / __| | | | |_) | |
|
||||
|
|
@ -33,11 +33,12 @@ from testenv import Env, CurlClient
|
|||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@pytest.mark.skipif(condition=not Env.httpd_is_at_least('2.4.55'),
|
||||
reason=f"httpd version too old for this: {Env.httpd_version()}")
|
||||
@pytest.mark.skipif(
|
||||
condition=not Env.httpd_is_at_least("2.4.55"),
|
||||
reason=f"httpd version too old for this: {Env.httpd_version()}",
|
||||
)
|
||||
class TestErrors:
|
||||
|
||||
@pytest.fixture(autouse=True, scope='class')
|
||||
@pytest.fixture(autouse=True, scope="class")
|
||||
def _class_scope(self, env, httpd, nghttpx):
|
||||
if env.have_h3():
|
||||
nghttpx.start_if_needed()
|
||||
|
|
@ -45,65 +46,75 @@ class TestErrors:
|
|||
httpd.reload()
|
||||
|
||||
# download 1 file, check that we get CURLE_PARTIAL_FILE
|
||||
@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
|
||||
@pytest.mark.parametrize("proto", ["http/1.1", "h2", "h3"])
|
||||
def test_05_01_partial_1(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")
|
||||
if proto == 'h3' and env.curl_uses_lib('msh3'):
|
||||
if proto == "h3" and env.curl_uses_lib("msh3"):
|
||||
pytest.skip("msh3 stalls here")
|
||||
count = 1
|
||||
curl = CurlClient(env=env)
|
||||
urln = f'https://{env.authority_for(env.domain1, proto)}' \
|
||||
f'/curltest/tweak?id=[0-{count - 1}]'\
|
||||
'&chunks=3&chunk_size=16000&body_error=reset'
|
||||
r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
|
||||
'--retry', '0'
|
||||
])
|
||||
urln = (
|
||||
f"https://{env.authority_for(env.domain1, proto)}"
|
||||
f"/curltest/tweak?id=[0-{count - 1}]"
|
||||
"&chunks=3&chunk_size=16000&body_error=reset"
|
||||
)
|
||||
r = curl.http_download(
|
||||
urls=[urln], alpn_proto=proto, extra_args=["--retry", "0"]
|
||||
)
|
||||
r.check_exit_code(False)
|
||||
invalid_stats = []
|
||||
for idx, s in enumerate(r.stats):
|
||||
if 'exitcode' not in s or s['exitcode'] not in [18, 56, 92, 95]:
|
||||
if "exitcode" not in s or s["exitcode"] not in [18, 56, 92, 95]:
|
||||
invalid_stats.append(f'request {idx} exit with {s["exitcode"]}')
|
||||
assert len(invalid_stats) == 0, f'failed: {invalid_stats}'
|
||||
assert len(invalid_stats) == 0, f"failed: {invalid_stats}"
|
||||
|
||||
# download files, check that we get CURLE_PARTIAL_FILE for all
|
||||
@pytest.mark.parametrize("proto", ['h2', 'h3'])
|
||||
@pytest.mark.parametrize("proto", ["h2", "h3"])
|
||||
def test_05_02_partial_20(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")
|
||||
if proto == 'h3' and env.curl_uses_lib('msh3'):
|
||||
if proto == "h3" and env.curl_uses_lib("msh3"):
|
||||
pytest.skip("msh3 stalls here")
|
||||
count = 20
|
||||
curl = CurlClient(env=env)
|
||||
urln = f'https://{env.authority_for(env.domain1, proto)}' \
|
||||
f'/curltest/tweak?id=[0-{count - 1}]'\
|
||||
'&chunks=5&chunk_size=16000&body_error=reset'
|
||||
r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
|
||||
'--retry', '0', '--parallel',
|
||||
])
|
||||
urln = (
|
||||
f"https://{env.authority_for(env.domain1, proto)}"
|
||||
f"/curltest/tweak?id=[0-{count - 1}]"
|
||||
"&chunks=5&chunk_size=16000&body_error=reset"
|
||||
)
|
||||
r = curl.http_download(
|
||||
urls=[urln],
|
||||
alpn_proto=proto,
|
||||
extra_args=[
|
||||
"--retry",
|
||||
"0",
|
||||
"--parallel",
|
||||
],
|
||||
)
|
||||
r.check_exit_code(False)
|
||||
assert len(r.stats) == count, f'did not get all stats: {r}'
|
||||
assert len(r.stats) == count, f"did not get all stats: {r}"
|
||||
invalid_stats = []
|
||||
for idx, s in enumerate(r.stats):
|
||||
if 'exitcode' not in s or s['exitcode'] not in [18, 55, 56, 92, 95]:
|
||||
if "exitcode" not in s or s["exitcode"] not in [18, 55, 56, 92, 95]:
|
||||
invalid_stats.append(f'request {idx} exit with {s["exitcode"]}\n{s}')
|
||||
assert len(invalid_stats) == 0, f'failed: {invalid_stats}'
|
||||
assert len(invalid_stats) == 0, f"failed: {invalid_stats}"
|
||||
|
||||
# access a resource that, on h2, RST the stream with HTTP_1_1_REQUIRED
|
||||
def test_05_03_required(self, env: Env, httpd, nghttpx):
|
||||
curl = CurlClient(env=env)
|
||||
proto = 'http/1.1'
|
||||
urln = f'https://{env.authority_for(env.domain1, proto)}/curltest/1_1'
|
||||
proto = "http/1.1"
|
||||
urln = f"https://{env.authority_for(env.domain1, proto)}/curltest/1_1"
|
||||
r = curl.http_download(urls=[urln], alpn_proto=proto)
|
||||
r.check_exit_code(0)
|
||||
r.check_response(http_status=200, count=1)
|
||||
proto = 'h2'
|
||||
urln = f'https://{env.authority_for(env.domain1, proto)}/curltest/1_1'
|
||||
proto = "h2"
|
||||
urln = f"https://{env.authority_for(env.domain1, proto)}/curltest/1_1"
|
||||
r = curl.http_download(urls=[urln], alpn_proto=proto)
|
||||
r.check_exit_code(0)
|
||||
r.check_response(http_status=200, count=1)
|
||||
# check that we did a downgrade
|
||||
assert r.stats[0]['http_version'] == '1.1', r.dump_logs()
|
||||
assert r.stats[0]["http_version"] == "1.1", r.dump_logs()
|
||||
|
||||
# On the URL used here, Apache is doing an "unclean" TLS shutdown,
|
||||
# meaning it sends no shutdown notice and just closes TCP.
|
||||
|
|
@ -114,19 +125,28 @@ class TestErrors:
|
|||
# and stop receiving when that signals the end
|
||||
# - h2 to work since it will signal the end of the response before
|
||||
# and not see the "unclean" close either
|
||||
@pytest.mark.parametrize("proto", ['http/1.0', 'http/1.1', 'h2'])
|
||||
@pytest.mark.parametrize("proto", ["http/1.0", "http/1.1", "h2"])
|
||||
def test_05_04_unclean_tls_shutdown(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")
|
||||
count = 10 if proto == 'h2' else 1
|
||||
count = 10 if proto == "h2" else 1
|
||||
curl = CurlClient(env=env)
|
||||
url = f'https://{env.authority_for(env.domain1, proto)}'\
|
||||
f'/curltest/shutdown_unclean?id=[0-{count-1}]&chunks=4'
|
||||
r = curl.http_download(urls=[url], alpn_proto=proto, extra_args=[
|
||||
'--parallel',
|
||||
])
|
||||
if proto == 'http/1.0' and not env.curl_uses_lib('wolfssl') and \
|
||||
(env.curl_is_debug() or not env.curl_uses_lib('openssl')):
|
||||
url = (
|
||||
f"https://{env.authority_for(env.domain1, proto)}"
|
||||
f"/curltest/shutdown_unclean?id=[0-{count-1}]&chunks=4"
|
||||
)
|
||||
r = curl.http_download(
|
||||
urls=[url],
|
||||
alpn_proto=proto,
|
||||
extra_args=[
|
||||
"--parallel",
|
||||
],
|
||||
)
|
||||
if (
|
||||
proto == "http/1.0"
|
||||
and not env.curl_uses_lib("wolfssl")
|
||||
and (env.curl_is_debug() or not env.curl_uses_lib("openssl"))
|
||||
):
|
||||
# we are inconsistent if we fail or not in missing TLS shutdown
|
||||
# openssl code ignore such errors intentionally in non-debug builds
|
||||
r.check_exit_code(56)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue