From: Stefan Eissing Date: Sat, 2 Jul 2022 08:58:26 +0000 (+0000) Subject: *) test: improved nghttp client output parsing. X-Git-Tag: 2.5.0-alpha2-ci-test-only~273 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea52642168c2ee1d2ffdc2e4a2bef85320619471;p=thirdparty%2Fapache%2Fhttpd.git *) test: improved nghttp client output parsing. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1902407 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/test/pyhttpd/nghttp.py b/test/pyhttpd/nghttp.py index 3927bc34ff3..84b8f20c6f4 100644 --- a/test/pyhttpd/nghttp.py +++ b/test/pyhttpd/nghttp.py @@ -80,6 +80,7 @@ class Nghttp: # chunk output into lines. nghttp mixes text # meta output with bytes from the response body. lines = [l.decode() for l in btext.split(b'\n')] + for lidx, l in enumerate(lines): if len(l) == 0: body += '\n' @@ -96,7 +97,6 @@ class Nghttp: header[hname] += ", %s" % hval else: header[hname] = hval - body = '' continue m = re.match(r'(.*)\[.*] recv HEADERS frame <.* stream_id=(\d+)>', l) @@ -120,7 +120,6 @@ class Nghttp: response["previous"] = prev response[hkey] = s["header"] s["header"] = {} - body = '' continue m = re.match(r'(.*)\[.*] recv DATA frame ', l) @@ -179,8 +178,8 @@ class Nghttp: if '[' != l[0]: skip_indents = None - body += l + '\n' - + body += l + '\n' + # the main request is done on the lowest odd numbered id main_stream = 99999999999 for sid in streams: