pytest: improvements

- set CURL_CI for pytest runs in CI environments
- exclude timing sensitive tests from CI runs
- for failed results, list only the log and stat of
  the failed transfer

- fix type in http.c comment

Closes #11812

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index bd6876aa1de6e280d4fae4580c3406013f2abdb1..8d984e58730599b59e2c6d8d33ecbf2903305319 100644 (file)
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -404,7 +404,8 @@ jobs:
       # run for `tests` directory, so pytest does not pick up any other
       # packages we might have built here
       run:
-        pytest -v tests
+        pytest tests
       name: 'run pytest'
       env:
         TFLAGS: "${{ matrix.build.tflags }}"
+        CURL_CI: github

diff --git a/.github/workflows/ngtcp2-linux.yml b/.github/workflows/ngtcp2-linux.yml
index a1512bb7de4f6b552d53bc699c35c28a8ba555cc..3eeb0cd69af318d99531bfd507f5218d4b58030a 100644 (file)
--- a/.github/workflows/ngtcp2-linux.yml
+++ b/.github/workflows/ngtcp2-linux.yml
@@ -263,15 +263,17 @@ jobs:
       env:
         TFLAGS: "${{ matrix.build.tflags }}"
 
-    - run: pytest -v
+    - run: pytest tests
       name: 'run pytest'
       env:
         TFLAGS: "${{ matrix.build.tflags }}"
+        CURL_CI: github
 
-    - run: pytest
+    - run: pytest tests
       name: 'run pytest with slowed network'
       env:
         # 33% of sends are EAGAINed
         CURL_DBG_SOCK_WBLOCK: 33
         # only 80% of data > 10 bytes is send
         CURL_DBG_SOCK_WPARTIAL: 80
+        CURL_CI: github

diff --git a/.github/workflows/quiche-linux.yml b/.github/workflows/quiche-linux.yml
index a28274cd0b3cfb3848cc22332e7c5632eab21637..f2b2bafa14d57448041755223db52d0e65e867b2 100644 (file)
--- a/.github/workflows/quiche-linux.yml
+++ b/.github/workflows/quiche-linux.yml
@@ -202,7 +202,8 @@ jobs:
       env:
         TFLAGS: "${{ matrix.build.tflags }}"
 
-    - run: pytest -v tests/http
+    - run: pytest tests
       name: 'run pytest'
       env:
         TFLAGS: "${{ matrix.build.tflags }}"
+        CURL_CI: github

diff --git a/lib/http.c b/lib/http.c
index 26aac873d15c4b45739242b5e016eb5c6a326ee5..647f36f19a4c5cdc5aa3744f3ceb05efc17a470e 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -2707,7 +2707,7 @@ CURLcode Curl_http_bodysend(struct Curl_easy *data, struct connectdata *conn,
 
         if(!data->req.upload_chunky) {
           /* We're not sending it 'chunked', append it to the request
-             already now to reduce the number if send() calls */
+             already now to reduce the number of send() calls */
           result = Curl_dyn_addn(r, data->set.postfields,
                                  (size_t)http->postsize);
           included_body = http->postsize;

diff --git a/tests/http/test_02_download.py b/tests/http/test_02_download.py
index d6bfe9cd364b77f66ce51e72718ef1da3e2af0ce..60aa2730975b84a2177f713ef72e83d6f83acca0 100644 (file)
--- a/tests/http/test_02_download.py
+++ b/tests/http/test_02_download.py
@@ -201,6 +201,7 @@ class TestDownload:
         r.check_response(count=count, http_status=200)
 
     @pytest.mark.skipif(condition=Env().slow_network, reason="not suitable for slow network tests")
+    @pytest.mark.skipif(condition=Env().ci_run, reason="not suitable for CI runs")
     @pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
     def test_02_10_10MB_serial(self, env: Env,
                               httpd, nghttpx, repeat, proto):
@@ -213,6 +214,7 @@ class TestDownload:
         r.check_response(count=count, http_status=200)
 
     @pytest.mark.skipif(condition=Env().slow_network, reason="not suitable for slow network tests")
+    @pytest.mark.skipif(condition=Env().ci_run, reason="not suitable for CI runs")
     @pytest.mark.parametrize("proto", ['h2', 'h3'])
     def test_02_11_10MB_parallel(self, env: Env,
                               httpd, nghttpx, repeat, proto):
@@ -255,6 +257,7 @@ class TestDownload:
         r.check_response(count=count, http_status=200)
 
     @pytest.mark.skipif(condition=Env().slow_network, reason="not suitable for slow network tests")
+    @pytest.mark.skipif(condition=Env().ci_run, reason="not suitable for CI runs")
     def test_02_20_h2_small_frames(self, env: Env, httpd, repeat):
         # Test case to reproduce content corruption as observed in
         # https://github.com/curl/curl/issues/10525

diff --git a/tests/http/test_04_stuttered.py b/tests/http/test_04_stuttered.py
index 818d333a93a6ee8c4ba72cc9159af11b205bc2a5..e017a44c3c3c059063006364375a5774dd18cfef 100644 (file)
--- a/tests/http/test_04_stuttered.py
+++ b/tests/http/test_04_stuttered.py
@@ -36,6 +36,7 @@ log = logging.getLogger(__name__)
 
 
 @pytest.mark.skipif(condition=Env().slow_network, reason="not suitable for slow network tests")
+@pytest.mark.skipif(condition=Env().ci_run, reason="not suitable for CI runs")
 class TestStuttered:
 
     @pytest.fixture(autouse=True, scope='class')

diff --git a/tests/http/test_08_caddy.py b/tests/http/test_08_caddy.py
index aa69e620ed85b03b4dae992760473d5543de16fb..c95d8457a8e64763c402011396597b2f1d096faa 100644 (file)
--- a/tests/http/test_08_caddy.py
+++ b/tests/http/test_08_caddy.py
@@ -111,6 +111,7 @@ class TestCaddy:
 
     # download 5MB files sequentially
     @pytest.mark.skipif(condition=Env().slow_network, reason="not suitable for slow network tests")
+    @pytest.mark.skipif(condition=Env().ci_run, reason="not suitable for CI runs")
     @pytest.mark.parametrize("proto", ['h2', 'h3'])
     def test_08_04a_download_10mb_sequential(self, env: Env, caddy: Caddy,
                                            repeat, proto):
@@ -126,6 +127,7 @@ class TestCaddy:
 
     # download 10MB files sequentially
     @pytest.mark.skipif(condition=Env().slow_network, reason="not suitable for slow network tests")
+    @pytest.mark.skipif(condition=Env().ci_run, reason="not suitable for CI runs")
     @pytest.mark.parametrize("proto", ['h2', 'h3'])
     def test_08_04b_download_10mb_sequential(self, env: Env, caddy: Caddy,
                                            repeat, proto):
@@ -142,6 +144,7 @@ class TestCaddy:
     # download 10MB files parallel
     @pytest.mark.skipif(condition=Env().slow_network, reason="not suitable for slow network tests")
     @pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+    @pytest.mark.skipif(condition=Env().ci_run, reason="not suitable for CI runs")
     def test_08_05_download_1mb_parallel(self, env: Env, caddy: Caddy,
                                          repeat, proto):
         if proto == 'h3' and not env.have_h3_curl():

diff --git a/tests/http/testenv/curl.py b/tests/http/testenv/curl.py
index 809087ae7fa0a3b18277b8cca29660e1556f1021..9f92f629cfae33a014c1e50c5608721cfa6df131 100644 (file)
--- a/tests/http/testenv/curl.py
+++ b/tests/http/testenv/curl.py
@@ -24,7 +24,6 @@
 #
 ###########################################################################
 #
-import pytest
 import json
 import logging
 import os
@@ -199,15 +198,15 @@ class ExecResult:
             if self.with_stats:
                 for idx, x in enumerate(self.stats):
                     assert 'http_code' in x, \
-                        f'response #{idx} reports no http_code\n{self.dump_logs()}'
+                        f'response #{idx} reports no http_code\n{self.dump_stat(x)}'
                     assert x['http_code'] == http_status, \
                         f'response #{idx} http_code: expected {http_status}, '\
-                        f'got {x["http_code"]}\n{self.dump_logs()}'
+                        f'got {x["http_code"]}\n{self.dump_stat(x)}'
             else:
                 for idx, x in enumerate(self.responses):
                     assert x['status'] == http_status, \
                         f'response #{idx} status: expected {http_status},'\
-                        f'got {x["status"]}\n{self.dump_logs()}'
+                        f'got {x["status"]}\n{self.dump_stat(x)}'
         if protocol is not None:
             if self.with_stats:
                 http_version = None
@@ -221,7 +220,7 @@ class ExecResult:
                     for idx, x in enumerate(self.stats):
                         assert x['http_version'] == http_version, \
                             f'response #{idx} protocol: expected http/{http_version},' \
-                            f'got version {x["http_version"]}\n{self.dump_logs()}'
+                            f'got version {x["http_version"]}\n{self.dump_stat(x)}'
             else:
                 for idx, x in enumerate(self.responses):
                     assert x['protocol'] == protocol, \
@@ -241,26 +240,44 @@ class ExecResult:
         if http_status is not None:
             for idx, x in enumerate(self.stats):
                 assert 'http_code' in x, \
-                    f'status #{idx} reports no http_code\n{self.dump_logs()}'
+                    f'status #{idx} reports no http_code\n{self.dump_stat(x)}'
                 assert x['http_code'] == http_status, \
                     f'status #{idx} http_code: expected {http_status}, '\
-                    f'got {x["http_code"]}\n{self.dump_logs()}'
+                    f'got {x["http_code"]}\n{self.dump_stat(x)}'
         if exitcode is not None:
             for idx, x in enumerate(self.stats):
                 if 'exitcode' in x:
                     assert x['exitcode'] == 0, \
                         f'status #{idx} exitcode: expected {exitcode}, '\
-                        f'got {x["exitcode"]}\n{self.dump_logs()}'
+                        f'got {x["exitcode"]}\n{self.dump_stat(x)}'
 
     def dump_logs(self):
-        lines = []
-        lines.append('>>--stdout ----------------------------------------------\n')
+        lines = ['>>--stdout ----------------------------------------------\n']
         lines.extend(self._stdout)
         lines.append('>>--stderr ----------------------------------------------\n')
         lines.extend(self._stderr)
         lines.append('<<-------------------------------------------------------\n')
         return ''.join(lines)
 
+    def dump_stat(self, x):
+        lines = [
+            'json stat from curl:',
+            json.JSONEncoder(indent=2).encode(x),
+        ]
+        if 'xfer_id' in x:
+            xfer_id = x['xfer_id']
+            lines.append(f'>>--xfer {xfer_id} trace:\n')
+            lines.extend(self.xfer_trace_for(xfer_id))
+        else:
+            lines.append('>>--full trace-------------------------------------------\n')
+            lines.extend(self._stderr)
+            lines.append('<<-------------------------------------------------------\n')
+        return ''.join(lines)
+
+    def xfer_trace_for(self, xfer_id) -> List[str]:
+            pat = re.compile(f'^[^[]* \\[{xfer_id}-.*$')
+            return [line for line in self._stderr if pat.match(line)]
+
 
 class CurlClient:
 

diff --git a/tests/http/testenv/env.py b/tests/http/testenv/env.py
index 440f574aad7e7a5b843a68c319a599ae44ba1946..7c5f7e31a0d782349d16c43a16680d374ab71da2 100644 (file)
--- a/tests/http/testenv/env.py
+++ b/tests/http/testenv/env.py
@@ -444,6 +444,10 @@ class Env:
         return "CURL_DBG_SOCK_WBLOCK" in os.environ or \
                "CURL_DBG_SOCK_WPARTIAL" in os.environ
 
+    @property
+    def ci_run(self) -> bool:
+        return "CURL_CI" in os.environ
+
     def authority_for(self, domain: str, alpn_proto: Optional[str] = None):
         if alpn_proto is None or \
                 alpn_proto in ['h2', 'http/1.1', 'http/1.0', 'http/0.9']: