From: Stefan Eissing <stefan@eissing.org>
Date: Fri, 24 Mar 2023 12:09:40 +0000 (+0100)
Subject: pytest: improvements for suitable curl and error output
X-Git-Tag: curl-8_1_0~278
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cabef6fc312b7a59e2cbf73fabd9f3cc2b459ba;p=thirdparty%2Fcurl.git

pytest: improvements for suitable curl and error output

- will check built curl for http and https support and
  skip all tests if not there
- will dump stdout/stderr/trace output on errored responses

Closes #10829
---

diff --git a/tests/http/conftest.py b/tests/http/conftest.py
index 8727fc323a..eecc0c0892 100644
--- a/tests/http/conftest.py
+++ b/tests/http/conftest.py
@@ -39,6 +39,13 @@ def env(pytestconfig) -> Env:
     env = Env(pytestconfig=pytestconfig)
     level = logging.DEBUG if env.verbose > 0 else logging.INFO
     logging.getLogger('').setLevel(level=level)
+    if not env.curl_has_protocol('http'):
+        pytest.skip("curl built without HTTP support")
+    if not env.curl_has_protocol('https'):
+        pytest.skip("curl built without HTTPS support")
+    if env.setup_incomplete():
+        pytest.skip(env.incomplete_reason())
+
     env.setup()
     return env
 
diff --git a/tests/http/scorecard.py b/tests/http/scorecard.py
index d9f789c9fa..271bf31fd0 100644
--- a/tests/http/scorecard.py
+++ b/tests/http/scorecard.py
@@ -70,7 +70,7 @@ class ScoreCard:
             errors = []
             for i in range(sample_size):
                 self.info('.')
-                curl = CurlClient(env=self.env)
+                curl = CurlClient(env=self.env, silent=True)
                 url = f'https://{authority}/'
                 r = curl.http_download(urls=[url], alpn_proto=proto, no_save=True)
                 if r.exit_code == 0 and len(r.stats) == 1:
@@ -93,7 +93,7 @@ class ScoreCard:
                 errors = []
                 for i in range(sample_size):
                     self.info('.')
-                    curl = CurlClient(env=self.env)
+                    curl = CurlClient(env=self.env, silent=True)
                     args = [
                         '--http3-only' if proto == 'h3' else '--http2',
                         f'--{ipv}', f'https://{authority}/'
@@ -140,7 +140,7 @@ class ScoreCard:
         errors = []
         self.info(f'{sample_size}x single')
         for i in range(sample_size):
-            curl = CurlClient(env=self.env)
+            curl = CurlClient(env=self.env, silent=True)
             r = curl.http_download(urls=[url], alpn_proto=proto, no_save=True)
             err = self._check_downloads(r, count)
             if err:
@@ -162,7 +162,7 @@ class ScoreCard:
         url = f'{url}?[0-{count - 1}]'
         self.info(f'{sample_size}x{count} serial')
         for i in range(sample_size):
-            curl = CurlClient(env=self.env)
+            curl = CurlClient(env=self.env, silent=True)
             r = curl.http_download(urls=[url], alpn_proto=proto, no_save=True)
             self.info(f'.')
             err = self._check_downloads(r, count)
@@ -185,7 +185,7 @@ class ScoreCard:
         url = f'{url}?[0-{count - 1}]'
         self.info(f'{sample_size}x{count} parallel')
         for i in range(sample_size):
-            curl = CurlClient(env=self.env)
+            curl = CurlClient(env=self.env, silent=True)
             start = datetime.now()
             r = curl.http_download(urls=[url], alpn_proto=proto, no_save=True,
                                    extra_args=['--parallel'])
diff --git a/tests/http/test_01_basic.py b/tests/http/test_01_basic.py
index ba513d19a7..66c9ae50e9 100644
--- a/tests/http/test_01_basic.py
+++ b/tests/http/test_01_basic.py
@@ -34,8 +34,6 @@ from testenv import CurlClient
 log = logging.getLogger(__name__)
 
 
-@pytest.mark.skipif(condition=Env.setup_incomplete(),
-                    reason=f"missing: {Env.incomplete_reason()}")
 class TestBasic:
 
     @pytest.fixture(autouse=True, scope='class')
@@ -48,7 +46,7 @@ class TestBasic:
         curl = CurlClient(env=env)
         url = f'http://{env.domain1}:{env.http_port}/data.json'
         r = curl.http_get(url=url)
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         assert r.response['status'] == 200
         assert r.json['server'] == env.domain1
 
@@ -57,7 +55,7 @@ class TestBasic:
         curl = CurlClient(env=env)
         url = f'https://{env.domain1}:{env.https_port}/data.json'
         r = curl.http_get(url=url)
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         assert r.response['status'] == 200
         assert r.json['server'] == env.domain1
 
@@ -66,7 +64,7 @@ class TestBasic:
         curl = CurlClient(env=env)
         url = f'https://{env.domain1}:{env.https_port}/data.json'
         r = curl.http_get(url=url, extra_args=['--http2'])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         assert r.response['status'] == 200
         assert r.response['protocol'] == 'HTTP/2'
         assert r.json['server'] == env.domain1
@@ -76,7 +74,7 @@ class TestBasic:
         curl = CurlClient(env=env)
         url = f'https://{env.domain2}:{env.https_port}/data.json'
         r = curl.http_get(url=url, extra_args=['--http2'])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         assert r.response['status'] == 200
         assert r.response['protocol'] == 'HTTP/1.1'
         assert r.json['server'] == env.domain2
@@ -87,7 +85,7 @@ class TestBasic:
         curl = CurlClient(env=env)
         url = f'https://{env.domain1}:{env.h3_port}/data.json'
         r = curl.http_get(url=url, extra_args=['--http3'])
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         assert r.response['status'] == 200
         assert r.response['protocol'] == 'HTTP/3'
         assert r.json['server'] == env.domain1
diff --git a/tests/http/test_02_download.py b/tests/http/test_02_download.py
index 1f2b362634..a0ae8a8209 100644
--- a/tests/http/test_02_download.py
+++ b/tests/http/test_02_download.py
@@ -36,8 +36,6 @@ from testenv import Env, CurlClient
 log = logging.getLogger(__name__)
 
 
-@pytest.mark.skipif(condition=Env.setup_incomplete(),
-                    reason=f"missing: {Env.incomplete_reason()}")
 class TestDownload:
 
     @pytest.fixture(autouse=True, scope='class')
@@ -61,7 +59,7 @@ class TestDownload:
         curl = CurlClient(env=env)
         url = f'https://{env.authority_for(env.domain1, proto)}/data.json'
         r = curl.http_download(urls=[url], alpn_proto=proto)
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)
         r.check_stats(count=1, exp_status=200)
 
     # download 2 files
@@ -72,7 +70,7 @@ class TestDownload:
         curl = CurlClient(env=env)
         url = f'https://{env.authority_for(env.domain1, proto)}/data.json?[0-1]'
         r = curl.http_download(urls=[url], alpn_proto=proto)
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=2, exp_status=200)
 
     # download 100 files sequentially
@@ -84,7 +82,7 @@ class TestDownload:
         curl = CurlClient(env=env)
         urln = f'https://{env.authority_for(env.domain1, proto)}/data.json?[0-99]'
         r = curl.http_download(urls=[urln], alpn_proto=proto)
-        assert r.exit_code == 0
+        r.check_exit_code(0)
         r.check_stats(count=100, exp_status=200)
         # http/1.1 sequential transfers will open 1 connection
         assert r.total_connects == 1
@@ -101,7 +99,7 @@ class TestDownload:
         r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
             '--parallel', '--parallel-max', f'{max_parallel}'
         ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=100, exp_status=200)
         if proto == 'http/1.1':
             # http/1.1 parallel transfers will open multiple connections
@@ -119,7 +117,7 @@ class TestDownload:
         curl = CurlClient(env=env)
         urln = f'https://{env.authority_for(env.domain1, proto)}/data.json?[0-499]'
         r = curl.http_download(urls=[urln], alpn_proto=proto)
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=500, exp_status=200)
         if proto == 'http/1.1':
             # http/1.1 parallel transfers will open multiple connections
@@ -141,7 +139,7 @@ class TestDownload:
         r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
             '--parallel', '--parallel-max', f'{max_parallel}'
         ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         # http2 parallel transfers will use one connection (common limit is 100)
         assert r.total_connects == 1
@@ -159,7 +157,7 @@ class TestDownload:
                                with_stats=True, extra_args=[
             '--parallel', '--parallel-max', '200'
         ])
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         # should have used 2 connections only (test servers allow 100 req/conn)
         assert r.total_connects == 2, "h2 should use fewer connections here"
@@ -175,7 +173,7 @@ class TestDownload:
                                with_stats=True, extra_args=[
             '--parallel'
         ])
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         # http/1.1 should have used count connections
         assert r.total_connects == count, "http/1.1 should use this many connections"
@@ -189,7 +187,7 @@ class TestDownload:
         urln = f'https://{env.authority_for(env.domain1, proto)}/data-1m?[0-{count-1}]'
         curl = CurlClient(env=env)
         r = curl.http_download(urls=[urln], alpn_proto=proto)
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
 
     @pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
@@ -203,7 +201,7 @@ class TestDownload:
         r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
             '--parallel'
         ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
 
     @pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
@@ -215,7 +213,7 @@ class TestDownload:
         urln = f'https://{env.authority_for(env.domain1, proto)}/data-10m?[0-{count-1}]'
         curl = CurlClient(env=env)
         r = curl.http_download(urls=[urln], alpn_proto=proto)
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
 
     @pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
@@ -229,7 +227,7 @@ class TestDownload:
         r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
             '--parallel'
         ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
 
     @pytest.mark.parametrize("proto", ['h2', 'h3'])
@@ -243,7 +241,7 @@ class TestDownload:
         r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
             '--head'
         ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
 
     @pytest.mark.parametrize("proto", ['h2'])
@@ -257,7 +255,7 @@ class TestDownload:
         r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
             '--head', '--http2-prior-knowledge', '--fail-early'
         ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
 
     def test_02_20_h2_small_frames(self, env: Env, httpd, repeat):
@@ -284,7 +282,7 @@ class TestDownload:
         r = curl.http_download(urls=[urln], alpn_proto="h2", extra_args=[
             '--parallel', '--parallel-max', '2'
         ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         srcfile = os.path.join(httpd.docs_dir, 'data-1m')
         for i in range(count):
diff --git a/tests/http/test_03_goaway.py b/tests/http/test_03_goaway.py
index 6db8a6cc98..e40ae35b09 100644
--- a/tests/http/test_03_goaway.py
+++ b/tests/http/test_03_goaway.py
@@ -36,8 +36,6 @@ from testenv import Env, CurlClient, ExecResult
 log = logging.getLogger(__name__)
 
 
-@pytest.mark.skipif(condition=Env.setup_incomplete(),
-                    reason=f"missing: {Env.incomplete_reason()}")
 class TestGoAway:
 
     @pytest.fixture(autouse=True, scope='class')
@@ -68,7 +66,7 @@ class TestGoAway:
         assert httpd.reload()
         t.join()
         r: ExecResult = self.r
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         # reload will shut down the connection gracefully with GOAWAY
         # we expect to see a second connection opened afterwards
@@ -101,7 +99,7 @@ class TestGoAway:
         assert nghttpx.reload(timeout=timedelta(seconds=2))
         t.join()
         r: ExecResult = self.r
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         # reload will shut down the connection gracefully with GOAWAY
         # we expect to see a second connection opened afterwards
         assert r.total_connects == 2
@@ -133,7 +131,7 @@ class TestGoAway:
         assert httpd.reload()
         t.join()
         r: ExecResult = self.r
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         # reload will shut down the connection gracefully with GOAWAY
         # we expect to see a second connection opened afterwards
diff --git a/tests/http/test_04_stuttered.py b/tests/http/test_04_stuttered.py
index 19d6a42530..0cad4c227e 100644
--- a/tests/http/test_04_stuttered.py
+++ b/tests/http/test_04_stuttered.py
@@ -34,8 +34,6 @@ from testenv import Env, CurlClient
 log = logging.getLogger(__name__)
 
 
-@pytest.mark.skipif(condition=Env.setup_incomplete(),
-                    reason=f"missing: {Env.incomplete_reason()}")
 class TestStuttered:
 
     @pytest.fixture(autouse=True, scope='class')
@@ -57,7 +55,7 @@ class TestStuttered:
                f'/curltest/tweak?id=[0-{count - 1}]'\
                '&chunks=100&chunk_size=100&chunk_delay=10ms'
         r = curl.http_download(urls=[urln], alpn_proto=proto)
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=1, exp_status=200)
 
     # download 50 files in 100 chunks a 100 bytes with 10ms delay between
@@ -77,7 +75,7 @@ class TestStuttered:
                '&chunks=100&chunk_size=100&chunk_delay=10ms'
         r = curl.http_download(urls=[url1, urln], alpn_proto=proto,
                                extra_args=['--parallel'])
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=warmups+count, exp_status=200)
         assert r.total_connects == 1
         t_avg, i_min, t_min, i_max, t_max = self.stats_spread(r.stats[warmups:], 'time_total')
@@ -100,7 +98,7 @@ class TestStuttered:
                '&chunks=1000&chunk_size=10&chunk_delay=100us'
         r = curl.http_download(urls=[url1, urln], alpn_proto=proto,
                                extra_args=['--parallel'])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=warmups+count, exp_status=200)
         assert r.total_connects == 1
         t_avg, i_min, t_min, i_max, t_max = self.stats_spread(r.stats[warmups:], 'time_total')
@@ -123,7 +121,7 @@ class TestStuttered:
                '&chunks=10000&chunk_size=1&chunk_delay=50us'
         r = curl.http_download(urls=[url1, urln], alpn_proto=proto,
                                extra_args=['--parallel'])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=warmups+count, exp_status=200)
         assert r.total_connects == 1
         t_avg, i_min, t_min, i_max, t_max = self.stats_spread(r.stats[warmups:], 'time_total')
diff --git a/tests/http/test_05_errors.py b/tests/http/test_05_errors.py
index 3de53a4cf2..dc14d3bd0c 100644
--- a/tests/http/test_05_errors.py
+++ b/tests/http/test_05_errors.py
@@ -35,8 +35,6 @@ from testenv import Env, CurlClient, ExecResult
 log = logging.getLogger(__name__)
 
 
-@pytest.mark.skipif(condition=Env.setup_incomplete(),
-                    reason=f"missing: {Env.incomplete_reason()}")
 @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:
@@ -62,7 +60,7 @@ class TestErrors:
         r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
             '--retry', '0'
         ])
-        assert r.exit_code != 0, f'{r}'
+        r.check_exit_code_not(0)
         invalid_stats = []
         for idx, s in enumerate(r.stats):
             if 'exitcode' not in s or s['exitcode'] not in [18, 56, 92]:
@@ -85,7 +83,7 @@ class TestErrors:
         r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
             '--retry', '0', '--parallel',
         ])
-        assert r.exit_code != 0, f'{r}'
+        r.check_exit_code_not(0)
         assert len(r.stats) == count, f'did not get all stats: {r}'
         invalid_stats = []
         for idx, s in enumerate(r.stats):
diff --git a/tests/http/test_06_eyeballs.py b/tests/http/test_06_eyeballs.py
index 0222abff5c..f30ecd36f3 100644
--- a/tests/http/test_06_eyeballs.py
+++ b/tests/http/test_06_eyeballs.py
@@ -35,8 +35,6 @@ from testenv import Env, CurlClient, ExecResult
 log = logging.getLogger(__name__)
 
 
-@pytest.mark.skipif(condition=Env.setup_incomplete(),
-                    reason=f"missing: {Env.incomplete_reason()}")
 class TestEyeballs:
 
     @pytest.fixture(autouse=True, scope='class')
@@ -52,7 +50,7 @@ class TestEyeballs:
         curl = CurlClient(env=env)
         urln = f'https://{env.authority_for(env.domain1, "h3")}/data.json'
         r = curl.http_download(urls=[urln], extra_args=['--http3-only'])
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=1, exp_status=200)
         assert r.stats[0]['http_version'] == '3'
 
@@ -63,7 +61,7 @@ class TestEyeballs:
         curl = CurlClient(env=env)
         urln = f'https://{env.authority_for(env.domain1, "h3")}/data.json'
         r = curl.http_download(urls=[urln], extra_args=['--http3-only'])
-        assert r.exit_code == 7, f'{r}'  # could not connect
+        r.check_exit_code(7)  
 
     # download using HTTP/3 on missing server with fallback on h2
     @pytest.mark.skipif(condition=not Env.have_h3(), reason=f"missing HTTP/3 support")
@@ -72,7 +70,7 @@ class TestEyeballs:
         curl = CurlClient(env=env)
         urln = f'https://{env.authority_for(env.domain1, "h3")}/data.json'
         r = curl.http_download(urls=[urln], extra_args=['--http3'])
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=1, exp_status=200)
         assert r.stats[0]['http_version'] == '2'
 
@@ -83,7 +81,7 @@ class TestEyeballs:
         curl = CurlClient(env=env)
         urln = f'https://{env.authority_for(env.domain2, "h3")}/data.json'
         r = curl.http_download(urls=[urln], extra_args=['--http3'])
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=1, exp_status=200)
         assert r.stats[0]['http_version'] == '1.1'
 
@@ -92,7 +90,7 @@ class TestEyeballs:
         curl = CurlClient(env=env)
         urln = f'https://{env.authority_for(env.domain1, "h2")}/data.json'
         r = curl.http_download(urls=[urln])
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=1, exp_status=200)
         assert r.stats[0]['time_connect'] > 0.0
         assert r.stats[0]['time_appconnect'] > 0.0
@@ -104,7 +102,7 @@ class TestEyeballs:
         r = curl.http_download(urls=[urln], extra_args=[
             '--resolve', f'not-valid.com:{env.https_port}:127.0.0.1'
         ])
-        assert r.exit_code != 0, f'{r}'
+        r.check_exit_code_not(0)
         r.check_stats(count=1, exp_status=0)
         assert r.stats[0]['time_connect'] > 0.0    # was tcp connected
         assert r.stats[0]['time_appconnect'] == 0  # but not SSL verified
@@ -116,7 +114,7 @@ class TestEyeballs:
         r = curl.http_download(urls=[urln], extra_args=[
             '--resolve', f'not-valid.com:{1}:127.0.0.1'
         ])
-        assert r.exit_code != 0, f'{r}'
+        r.check_exit_code_not(0)
         r.check_stats(count=1, exp_status=0)
         assert r.stats[0]['time_connect'] == 0     # no one should have listened
         assert r.stats[0]['time_appconnect'] == 0  # did not happen either
diff --git a/tests/http/test_07_upload.py b/tests/http/test_07_upload.py
index a4752e5147..c2c7e51971 100644
--- a/tests/http/test_07_upload.py
+++ b/tests/http/test_07_upload.py
@@ -34,8 +34,6 @@ from testenv import Env, CurlClient
 log = logging.getLogger(__name__)
 
 
-@pytest.mark.skipif(condition=Env.setup_incomplete(),
-                    reason=f"missing: {Env.incomplete_reason()}")
 class TestUpload:
 
     @pytest.fixture(autouse=True, scope='class')
@@ -56,7 +54,7 @@ class TestUpload:
         curl = CurlClient(env=env)
         url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-0]'
         r = curl.http_upload(urls=[url], data=data, alpn_proto=proto)
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=1, exp_status=200)
         respdata = open(curl.response_file(0)).readlines()
         assert respdata == [data]
@@ -70,7 +68,7 @@ class TestUpload:
         curl = CurlClient(env=env)
         url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-0]'
         r = curl.http_upload(urls=[url], data=f'@{fdata}', alpn_proto=proto)
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=1, exp_status=200)
         indata = open(fdata).readlines()
         respdata = open(curl.response_file(0)).readlines()
@@ -86,7 +84,7 @@ class TestUpload:
         curl = CurlClient(env=env)
         url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
         r = curl.http_upload(urls=[url], data=data, alpn_proto=proto)
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         for i in range(count):
             respdata = open(curl.response_file(i)).readlines()
@@ -104,7 +102,7 @@ class TestUpload:
         url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
         r = curl.http_upload(urls=[url], data=data, alpn_proto=proto,
                              extra_args=['--parallel'])
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         for i in range(count):
             respdata = open(curl.response_file(i)).readlines()
@@ -120,7 +118,7 @@ class TestUpload:
         curl = CurlClient(env=env)
         url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
         r = curl.http_upload(urls=[url], data=f'@{fdata}', alpn_proto=proto)
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         indata = open(fdata).readlines()
         r.check_stats(count=count, exp_status=200)
@@ -138,7 +136,7 @@ class TestUpload:
         curl = CurlClient(env=env)
         url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
         r = curl.http_upload(urls=[url], data=f'@{fdata}', alpn_proto=proto)
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         indata = open(fdata).readlines()
         r.check_stats(count=count, exp_status=200)
@@ -158,7 +156,7 @@ class TestUpload:
         url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
         r = curl.http_upload(urls=[url], data=data, alpn_proto=proto,
                              extra_args=['--parallel'])
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         for i in range(count):
             respdata = open(curl.response_file(i)).readlines()
@@ -178,7 +176,7 @@ class TestUpload:
         url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
         r = curl.http_upload(urls=[url], data=f'@{fdata}', alpn_proto=proto,
                              extra_args=['--parallel'])
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         indata = open(fdata).readlines()
         r.check_stats(count=count, exp_status=200)
@@ -197,7 +195,7 @@ class TestUpload:
         url = f'https://{env.authority_for(env.domain1, proto)}/curltest/put?id=[0-{count-1}]'
         r = curl.http_put(urls=[url], fdata=fdata, alpn_proto=proto,
                              extra_args=['--parallel'])
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         exp_data = [f'{os.path.getsize(fdata)}']
         r.check_stats(count=count, exp_status=200)
@@ -216,7 +214,7 @@ class TestUpload:
         url = f'https://{env.authority_for(env.domain1, proto)}/curltest/put?id=[0-{count-1}]&chunk_delay=10ms'
         r = curl.http_put(urls=[url], fdata=fdata, alpn_proto=proto,
                              extra_args=['--parallel'])
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         exp_data = [f'{os.path.getsize(fdata)}']
         r.check_stats(count=count, exp_status=200)
diff --git a/tests/http/test_08_caddy.py b/tests/http/test_08_caddy.py
index 683fb7a33d..66c7c900e8 100644
--- a/tests/http/test_08_caddy.py
+++ b/tests/http/test_08_caddy.py
@@ -68,7 +68,7 @@ class TestCaddy:
         curl = CurlClient(env=env)
         url = f'https://{env.domain1}:{caddy.port}/data.json'
         r = curl.http_download(urls=[url], alpn_proto=proto)
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         r.check_stats(count=1, exp_status=200)
 
     # download 1MB files sequentially
@@ -81,7 +81,7 @@ class TestCaddy:
         curl = CurlClient(env=env)
         urln = f'https://{env.domain1}:{caddy.port}/data1.data?[0-{count-1}]'
         r = curl.http_download(urls=[urln], alpn_proto=proto)
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         # sequential transfers will open 1 connection
         assert r.total_connects == 1
@@ -98,7 +98,7 @@ class TestCaddy:
         r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
             '--parallel'
         ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         if proto == 'http/1.1':
             # http/1.1 parallel transfers will open multiple connections
@@ -118,7 +118,7 @@ class TestCaddy:
         curl = CurlClient(env=env)
         urln = f'https://{env.domain1}:{caddy.port}/data10.data?[0-{count-1}]'
         r = curl.http_download(urls=[urln], alpn_proto=proto)
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         # sequential transfers will open 1 connection
         assert r.total_connects == 1
@@ -137,7 +137,7 @@ class TestCaddy:
         r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
             '--parallel'
         ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         if proto == 'http/1.1':
             # http/1.1 parallel transfers will open multiple connections
diff --git a/tests/http/test_09_push.py b/tests/http/test_09_push.py
index 81a6e4fc70..be1b73a25f 100644
--- a/tests/http/test_09_push.py
+++ b/tests/http/test_09_push.py
@@ -34,8 +34,6 @@ from testenv import Env, CurlClient
 log = logging.getLogger(__name__)
 
 
-@pytest.mark.skipif(condition=Env.setup_incomplete(),
-                    reason=f"missing: {Env.incomplete_reason()}")
 class TestPush:
 
     @pytest.fixture(autouse=True, scope='class')
@@ -68,7 +66,7 @@ class TestPush:
         url = f'https://{env.domain1}:{env.https_port}/push/data1'
         r = curl.http_download(urls=[url], alpn_proto='h2', with_stats=False,
                                with_headers=True)
-        assert r.exit_code == 0, f'{r}'
+        r.check_exit_code(0)  
         assert len(r.responses) == 2, f'{r.responses}'
         assert r.responses[0]['status'] == 103, f'{r.responses}'
         assert 'link' in r.responses[0]['header'], f'{r.responses[0]}'
diff --git a/tests/http/test_10_proxy.py b/tests/http/test_10_proxy.py
index 3bf3cd11fc..b93d665b04 100644
--- a/tests/http/test_10_proxy.py
+++ b/tests/http/test_10_proxy.py
@@ -34,8 +34,6 @@ from testenv import Env, CurlClient
 log = logging.getLogger(__name__)
 
 
-@pytest.mark.skipif(condition=Env.setup_incomplete(),
-                    reason=f"missing: {Env.incomplete_reason()}")
 class TestProxy:
 
     @pytest.fixture(autouse=True, scope='class')
@@ -55,7 +53,7 @@ class TestProxy:
                                  '--proxy', f'http://{env.proxy_domain}:{env.proxy_port}/',
                                  '--resolve', f'{env.proxy_domain}:{env.proxy_port}:127.0.0.1',
                                ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=1, exp_status=200)
 
     # download via https: proxy (no tunnel)
@@ -70,7 +68,7 @@ class TestProxy:
                                  '--resolve', f'{env.proxy_domain}:{env.proxys_port}:127.0.0.1',
                                  '--proxy-cacert', env.ca.cert_file,
                                ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=1, exp_status=200)
 
     # download http: via http: proxytunnel
@@ -83,7 +81,7 @@ class TestProxy:
                                  '--proxy', f'http://{env.proxy_domain}:{env.proxy_port}/',
                                  '--resolve', f'{env.proxy_domain}:{env.proxy_port}:127.0.0.1',
                                ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=1, exp_status=200)
 
     # download http: via https: proxytunnel
@@ -99,7 +97,7 @@ class TestProxy:
                                  '--resolve', f'{env.proxy_domain}:{env.proxys_port}:127.0.0.1',
                                  '--proxy-cacert', env.ca.cert_file,
                                ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=1, exp_status=200)
 
     # download https: with proto via http: proxytunnel
@@ -114,7 +112,7 @@ class TestProxy:
                                  '--proxy', f'http://{env.proxy_domain}:{env.proxy_port}/',
                                  '--resolve', f'{env.proxy_domain}:{env.proxy_port}:127.0.0.1',
                                ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=1, exp_status=200)
         exp_proto = 'HTTP/2' if proto == 'h2' else 'HTTP/1.1'
         assert r.response['protocol'] == exp_proto
@@ -134,7 +132,7 @@ class TestProxy:
                                  '--resolve', f'{env.proxy_domain}:{env.proxys_port}:127.0.0.1',
                                  '--proxy-cacert', env.ca.cert_file,
                                ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=1, exp_status=200)
         exp_proto = 'HTTP/2' if proto == 'h2' else 'HTTP/1.1'
         assert r.response['protocol'] == exp_proto
diff --git a/tests/http/test_11_unix.py b/tests/http/test_11_unix.py
index e263cc752e..86ecd6f86a 100644
--- a/tests/http/test_11_unix.py
+++ b/tests/http/test_11_unix.py
@@ -83,9 +83,6 @@ Content-Length: 19
                 self._done = True
 
 
-
-@pytest.mark.skipif(condition=Env.setup_incomplete(),
-                    reason=f"missing: {Env.incomplete_reason()}")
 class TestUnix:
 
     @pytest.fixture(scope="class")
@@ -104,7 +101,7 @@ class TestUnix:
                                extra_args=[
                                  '--unix-socket', uds_faker.path,
                                ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=1, exp_status=200)
 
     # download https: via unix socket
@@ -115,7 +112,7 @@ class TestUnix:
                                extra_args=[
                                  '--unix-socket', uds_faker.path,
                                ])
-        assert r.exit_code == 35  # CONNECT_ERROR (as faker is not TLS)
+        r.check_exit_code(35)  
 
     # download HTTP/3 via unix socket
     @pytest.mark.skipif(condition=not Env.have_h3(), reason='h3 not supported')
@@ -127,4 +124,4 @@ class TestUnix:
                                extra_args=[
                                  '--unix-socket', uds_faker.path,
                                ])
-        assert r.exit_code == 96  # QUIC CONNECT ERROR
+        r.check_exit_code(96)  
diff --git a/tests/http/test_12_reuse.py b/tests/http/test_12_reuse.py
index cd43888bde..cd22af6e98 100644
--- a/tests/http/test_12_reuse.py
+++ b/tests/http/test_12_reuse.py
@@ -36,8 +36,6 @@ from testenv import Env, CurlClient
 log = logging.getLogger(__name__)
 
 
-@pytest.mark.skipif(condition=Env.setup_incomplete(),
-                    reason=f"missing: {Env.incomplete_reason()}")
 @pytest.mark.skipif(condition=Env.curl_uses_lib('bearssl'), reason='BearSSL too slow')
 class TestReuse:
 
@@ -54,7 +52,7 @@ class TestReuse:
         curl = CurlClient(env=env)
         urln = f'https://{env.authority_for(env.domain1, proto)}/data.json?[0-{count-1}]'
         r = curl.http_download(urls=[urln], alpn_proto=proto)
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         # Server sends `Connection: close` on every 2nd request, requiring
         # a new connection
@@ -74,7 +72,7 @@ class TestReuse:
         r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
             '--rate', '30/m',
         ])
-        assert r.exit_code == 0
+        r.check_exit_code(0)  
         r.check_stats(count=count, exp_status=200)
         # Connections time out on server before we send another request,
         assert r.total_connects == count
diff --git a/tests/http/testenv/curl.py b/tests/http/testenv/curl.py
index 13c4f8465d..22a8ffb6eb 100644
--- a/tests/http/testenv/curl.py
+++ b/tests/http/testenv/curl.py
@@ -44,6 +44,7 @@ class ExecResult:
 
     def __init__(self, args: List[str], exit_code: int,
                  stdout: List[str], stderr: List[str],
+                 trace: Optional[List[str]] = None,
                  duration: Optional[timedelta] = None,
                  with_stats: bool = False,
                  exception: Optional[str] = None):
@@ -52,6 +53,7 @@ class ExecResult:
         self._exception = exception
         self._stdout = stdout
         self._stderr = stderr
+        self._trace = trace
         self._duration = duration if duration is not None else timedelta()
         self._response = None
         self._responses = []
@@ -157,35 +159,64 @@ class ExecResult:
     def add_assets(self, assets: List):
         self._assets.extend(assets)
 
+    def check_exit_code(self, code: int):
+        assert self.exit_code == code, \
+            f'expected exit code {code}, '\
+            'got {self.exit_code}\n{self._dump_logs()}'
+
+    def check_exit_code_not(self, code: int):
+        assert self.exit_code != code, \
+            f'expected exit code other than {code}\n{self._dump_logs()}'
+
     def check_responses(self, count: int, exp_status: Optional[int] = None,
                         exp_exitcode: Optional[int] = None):
         assert len(self.responses) == count, \
-            f'response count: expected {count}, got {len(self.responses)}'
+            f'response count: expected {count}, ' \
+            f'got {len(self.responses)}\n{self._dump_logs()}'
         if exp_status is not None:
             for idx, x in enumerate(self.responses):
                 assert x['status'] == exp_status, \
-                    f'response #{idx} unexpectedstatus: {x["status"]}'
+                    f'response #{idx} status: expected {exp_status},'\
+                    f'got {x["status"]}\n{self._dump_logs()}'
         if exp_exitcode is not None:
             for idx, x in enumerate(self.responses):
                 if 'exitcode' in x:
-                    assert x['exitcode'] == 0, f'response #{idx} exitcode: {x["exitcode"]}'
+                    assert x['exitcode'] == 0, \
+                        f'response #{idx} exitcode: expected {exp_exitcode}, '\
+                        f'got {x["exitcode"]}\n{self._dump_logs()}'
         if self.with_stats:
-            assert len(self.stats) == count, f'{self}'
+            self.check_stats(count)
 
     def check_stats(self, count: int, exp_status: Optional[int] = None,
-                        exp_exitcode: Optional[int] = None):
+                    exp_exitcode: Optional[int] = None):
         assert len(self.stats) == count, \
-            f'stats count: expected {count}, got {len(self.stats)}'
+            f'stats count: expected {count}, got {len(self.stats)}\n{self._dump_logs()}'
         if exp_status is not None:
             for idx, x in enumerate(self.stats):
                 assert 'http_code' in x, \
-                    f'status #{idx} reports no http_code'
+                    f'status #{idx} reports no http_code\n{self._dump_logs()}'
                 assert x['http_code'] == exp_status, \
-                    f'status #{idx} unexpected http_code: {x["http_code"]}'
+                    f'status #{idx} http_code: expected {exp_status}, '\
+                    f'got {x["http_code"]}\n{self._dump_logs()}'
         if exp_exitcode is not None:
             for idx, x in enumerate(self.stats):
                 if 'exitcode' in x:
-                    assert x['exitcode'] == 0, f'status #{idx} exitcode: {x["exitcode"]}'
+                    assert x['exitcode'] == 0, \
+                        f'status #{idx} exitcode: expected {exp_exitcode}, '\
+                        f'got {x["exitcode"]}\n{self._dump_logs()}'
+
+    def _dump_logs(self):
+        lines = []
+        lines.append('>>--stdout ----------------------------------------------\n')
+        lines.extend(self._stdout)
+        if self._trace:
+            lines.append('>>--trace ----------------------------------------------\n')
+            lines.extend(self._trace)
+        else:
+            lines.append('>>--stderr ----------------------------------------------\n')
+            lines.extend(self._stderr)
+        lines.append('<<-------------------------------------------------------\n')
+        return ''.join(lines)
 
 
 class CurlClient:
@@ -200,7 +231,7 @@ class CurlClient:
     }
 
     def __init__(self, env: Env, run_dir: Optional[str] = None,
-                 timeout: Optional[float] = None):
+                 timeout: Optional[float] = None, silent: bool = False):
         self.env = env
         self._timeout = timeout if timeout else env.test_timeout
         self._curl = os.environ['CURL'] if 'CURL' in os.environ else env.curl
@@ -210,6 +241,7 @@ class CurlClient:
         self._headerfile = f'{self._run_dir}/curl.headers'
         self._tracefile = f'{self._run_dir}/curl.trace'
         self._log_path = f'{self._run_dir}/curl.log'
+        self._silent = silent
         self._rmrf(self._run_dir)
         self._mkpath(self._run_dir)
 
@@ -333,14 +365,17 @@ class CurlClient:
                                        input=intext.encode() if intext else None,
                                        timeout=self._timeout)
                     exitcode = p.returncode
-        except subprocess.TimeoutExpired as e:
+        except subprocess.TimeoutExpired:
             log.warning(f'Timeout after {self._timeout}s: {args}')
             exitcode = -1
             exception = 'TimeoutExpired'
         coutput = open(self._stdoutfile).readlines()
         cerrput = open(self._stderrfile).readlines()
+        ctrace = None
+        if os.path.exists(self._tracefile):
+            ctrace = open(self._tracefile).readlines()
         return ExecResult(args=args, exit_code=exitcode, exception=exception,
-                          stdout=coutput, stderr=cerrput,
+                          stdout=coutput, stderr=cerrput, trace=ctrace,
                           duration=datetime.now() - start,
                           with_stats=with_stats)
 
@@ -370,10 +405,12 @@ class CurlClient:
         args = [self._curl, "-s", "--path-as-is"]
         if with_headers:
             args.extend(["-D", self._headerfile])
-        if self.env.verbose > 1:
-            args.extend(['--trace', self._tracefile])
         if self.env.verbose > 2:
             args.extend(['--trace', self._tracefile, '--trace-time'])
+        elif self.env.verbose > 1:
+            args.extend(['--trace', self._tracefile])
+        elif not self._silent:
+            args.extend(['-v'])
 
         for url in urls:
             u = urlparse(urls[0])
@@ -457,4 +494,3 @@ class CurlClient:
 
         fin_response(response)
         return r
-
diff --git a/tests/http/testenv/env.py b/tests/http/testenv/env.py
index c34d79129d..caf9249b1a 100644
--- a/tests/http/testenv/env.py
+++ b/tests/http/testenv/env.py
@@ -237,6 +237,11 @@ class Env:
     def curl_has_feature(feature: str) -> bool:
         return feature.lower() in Env.CONFIG.curl_props['features']
 
+    @staticmethod
+    def curl_has_protocol(protocol: str) -> bool:
+        return protocol.lower() in Env.CONFIG.curl_props['protocols']
+
+
     @staticmethod
     def curl_lib_version(libname: str) -> str:
         prefix = f'{libname.lower()}/'