From: Rainer Jung <rjung@apache.org>
Date: Thu, 4 Apr 2024 22:20:31 +0000 (+0000)
Subject: Fix failing pytest modules/http2/test_712_buffering.py:48.
X-Git-Tag: 2.4.60-rc1-candidate~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fdace475865501212004cab9c9a09b1590f7784;p=thirdparty%2Fapache%2Fhttpd.git

Fix failing pytest modules/http2/test_712_buffering.py:48.

Do not count lines like "00:12:26.578220 <= Recv data, 0 bytes (0x0)"
(which happen before the final close) as receiving a real chunk.

Backport of r1918606 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916807 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/pyhttpd/curl.py b/test/pyhttpd/curl.py
index 5a215cd5909..3d7993ffe13 100644
--- a/test/pyhttpd/curl.py
+++ b/test/pyhttpd/curl.py
@@ -112,7 +112,7 @@ class CurlPiper:
         recv_times = []
         for line in "".join(recv_err).split('\n'):
             m = re.match(r'^\s*(\d+:\d+:\d+(\.\d+)?) <= Recv data, (\d+) bytes.*', line)
-            if m:
+            if m and int(m.group(3)) > 0:
                 recv_times.append(datetime.time.fromisoformat(m.group(1)))
         # received as many chunks as we sent
         assert len(chunks) == len(recv_times), "received response not in {0} chunks, but {1}".format(