Fix implicit body asserts on compressed response body

integration/test_format.py

@@ -28,7 +28,7 @@ def test(format_type, hurl_file):
     expected = open(output_file, encoding="utf-8").read().strip()
     actual = decode_string(result.stdout)
     if actual != expected:
-        print(">>> error in stdout")
+        print(f">>> error in stdout for {format_type}")
         print(f"actual: <{actual}>\nexpected: <{expected}>")
         sys.exit(1)
 

integration/tests_ok/compressed.curl

@@ -1,7 +1,19 @@
 curl 'http://localhost:8000/compressed/none' --compressed
+curl 'http://localhost:8000/compressed/none' --compressed
+curl 'http://localhost:8000/compressed/none' --compressed
+curl 'http://localhost:8000/compressed/none' --compressed
+curl 'http://localhost:8000/compressed/gzip' --compressed
+curl 'http://localhost:8000/compressed/gzip' --compressed
+curl 'http://localhost:8000/compressed/gzip' --compressed
 curl 'http://localhost:8000/compressed/gzip' --compressed
 curl 'http://localhost:8000/compressed/zlib' --compressed
+curl 'http://localhost:8000/compressed/zlib' --compressed
+curl 'http://localhost:8000/compressed/zlib' --compressed
+curl 'http://localhost:8000/compressed/zlib' --compressed
 # curl needs to be built with brotli support
 curl 'http://localhost:8000/compressed/brotli' --compressed
+curl 'http://localhost:8000/compressed/brotli' --compressed
+curl 'http://localhost:8000/compressed/brotli' --compressed
+curl 'http://localhost:8000/compressed/brotli' --compressed
 curl 'http://localhost:8000/compressed/brotli_identity' --compressed
 

integration/tests_ok/compressed.html

@@ -1,4 +1,7 @@
-<pre><code class="language-hurl"><span class="hurl-entry"><span class="request"><span class="line"></span><span class="comment"># -- COMPRESSED HAS NO EFFECT ON NON-COMPRESSED</span>
+<pre><code class="language-hurl"><span class="hurl-entry"><span class="request"><span class="line"></span><span class="comment"># Uncompressed body tests:</span>
+<span class="line"></span><span class="comment"># ---------------------------</span>
+<span class="line"></span><span class="comment"># --compressed has no effect on non compressed.</span>
+<span class="line"></span>
 <span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/none</span></span>
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="line"><span class="string">Content-Length</span><span>:</span> <span class="string">12</span></span>
@@ -10,6 +13,25 @@
 <span class="line"><span class="query-type">md5</span> <span class="predicate-type">==</span> hex,<span class="hex">ed076287532e86365e841e92bfc50d8c</span>;</span>
 <span class="raw"><span class="line">```Hello World!```</span></span>
 </span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"></span><span class="comment"># Test base64 implicit body:</span>
+<span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/none</span></span>
+</span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
+<span class="line">base64,<span class="base64">SGVsbG8gV29ybGQh</span>;</span>
+</span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"></span><span class="comment"># Test hex implicit body:</span>
+<span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/none</span></span>
+</span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
+<span class="line">hex,<span class="hex">48656c6c6f20576f726c6421</span>;</span>
+</span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"></span><span class="comment"># Test file implicit body:</span>
+<span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/none</span></span>
+</span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
+<span class="line">file,<span class="filename">hello.txt</span>;</span>
+</span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"></span>
+<span class="line"></span><span class="comment"># GZip compressed body tests:</span>
+<span class="line"></span><span class="comment"># ---------------------------</span>
+<span class="line"></span>
 <span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/gzip</span></span>
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="line"><span class="string">Content-Length</span><span>:</span> <span class="string">32</span></span>
@@ -22,6 +44,25 @@
 <span class="line"><span class="query-type">md5</span> <span class="predicate-type">==</span> hex,<span class="hex">ed076287532e86365e841e92bfc50d8c</span>;</span>
 <span class="raw"><span class="line">```Hello World!```</span></span>
 </span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"></span><span class="comment"># Test base64 implicit body:</span>
+<span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/gzip</span></span>
+</span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
+<span class="line">base64,<span class="base64">SGVsbG8gV29ybGQh</span>;</span>
+</span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"></span><span class="comment"># Test hex implicit body:</span>
+<span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/gzip</span></span>
+</span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
+<span class="line">hex,<span class="hex">48656c6c6f20576f726c6421</span>;</span>
+</span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"></span><span class="comment"># Test file implicit body:</span>
+<span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/gzip</span></span>
+</span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
+<span class="line">file,<span class="filename">hello.txt</span>;</span>
+</span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"></span>
+<span class="line"></span><span class="comment"># ZLib compressed body tests:</span>
+<span class="line"></span><span class="comment"># ---------------------------</span>
+<span class="line"></span>
 <span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/zlib</span></span>
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="line"><span class="string">Content-Length</span><span>:</span> <span class="string">20</span></span>
@@ -34,6 +75,25 @@
 <span class="line"><span class="query-type">md5</span> <span class="predicate-type">==</span> hex,<span class="hex">ed076287532e86365e841e92bfc50d8c</span>;</span>
 <span class="raw"><span class="line">```Hello World!```</span></span>
 </span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"></span><span class="comment"># Test base64 implicit body:</span>
+<span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/zlib</span></span>
+</span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
+<span class="line">base64,<span class="base64">SGVsbG8gV29ybGQh</span>;</span>
+</span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"></span><span class="comment"># Test hex implicit body:</span>
+<span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/zlib</span></span>
+</span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
+<span class="line">hex,<span class="hex">48656c6c6f20576f726c6421</span>;</span>
+</span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"></span><span class="comment"># Test file implicit body:</span>
+<span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/zlib</span></span>
+</span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
+<span class="line">file,<span class="filename">hello.txt</span>;</span>
+</span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"></span>
+<span class="line"></span><span class="comment"># Brotli compressed body tests:</span>
+<span class="line"></span><span class="comment"># ---------------------------</span>
+<span class="line"></span>
 <span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/brotli</span></span>
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="line"><span class="string">Content-Length</span><span>:</span> <span class="string">17</span></span>
@@ -46,6 +106,21 @@
 <span class="line"><span class="query-type">md5</span> <span class="predicate-type">==</span> hex,<span class="hex">ed076287532e86365e841e92bfc50d8c</span>;</span>
 <span class="raw"><span class="line">```Hello World!```</span></span>
 </span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"></span><span class="comment"># Test base64 implicit body:</span>
+<span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/brotli</span></span>
+</span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
+<span class="line">base64,<span class="base64">SGVsbG8gV29ybGQh</span>;</span>
+</span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"></span><span class="comment"># Test hex implicit body:</span>
+<span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/brotli</span></span>
+</span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
+<span class="line">hex,<span class="hex">48656c6c6f20576f726c6421</span>;</span>
+</span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"></span><span class="comment"># Test file implicit body:</span>
+<span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/brotli</span></span>
+</span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
+<span class="line">file,<span class="filename">hello.txt</span>;</span>
+</span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
 <span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/compressed/brotli_identity</span></span>
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="line"><span class="string">Content-Length</span><span>:</span> <span class="string">17</span></span>

integration/tests_ok/compressed.hurl

@@ -1,4 +1,7 @@
-# -- COMPRESSED HAS NO EFFECT ON NON-COMPRESSED
+# Uncompressed body tests:
+# ---------------------------
+# --compressed has no effect on non compressed.
+
 GET http://localhost:8000/compressed/none
 HTTP/1.0 200
 Content-Length: 12
@@ -10,6 +13,25 @@ sha256 == hex,7f83b1657ff1fc53b92dc18148a1d65dfc2d4b1fa3d677284addd200126d9069;
 md5 == hex,ed076287532e86365e841e92bfc50d8c;
 ```Hello World!```
 
+# Test base64 implicit body:
+GET http://localhost:8000/compressed/none
+HTTP/1.0 200
+base64,SGVsbG8gV29ybGQh;
+
+# Test hex implicit body:
+GET http://localhost:8000/compressed/none
+HTTP/1.0 200
+hex,48656c6c6f20576f726c6421;
+
+# Test file implicit body:
+GET http://localhost:8000/compressed/none
+HTTP/1.0 200
+file,hello.txt;
+
+
+# GZip compressed body tests:
+# ---------------------------
+
 GET http://localhost:8000/compressed/gzip
 HTTP/1.0 200
 Content-Length: 32
@@ -22,6 +44,25 @@ sha256 == hex,7f83b1657ff1fc53b92dc18148a1d65dfc2d4b1fa3d677284addd200126d9069;
 md5 == hex,ed076287532e86365e841e92bfc50d8c;
 ```Hello World!```
 
+# Test base64 implicit body:
+GET http://localhost:8000/compressed/gzip
+HTTP/1.0 200
+base64,SGVsbG8gV29ybGQh;
+
+# Test hex implicit body:
+GET http://localhost:8000/compressed/gzip
+HTTP/1.0 200
+hex,48656c6c6f20576f726c6421;
+
+# Test file implicit body:
+GET http://localhost:8000/compressed/gzip
+HTTP/1.0 200
+file,hello.txt;
+
+
+# ZLib compressed body tests:
+# ---------------------------
+
 GET http://localhost:8000/compressed/zlib
 HTTP/1.0 200
 Content-Length: 20
@@ -34,6 +75,25 @@ sha256 == hex,7f83b1657ff1fc53b92dc18148a1d65dfc2d4b1fa3d677284addd200126d9069;
 md5 == hex,ed076287532e86365e841e92bfc50d8c;
 ```Hello World!```
 
+# Test base64 implicit body:
+GET http://localhost:8000/compressed/zlib
+HTTP/1.0 200
+base64,SGVsbG8gV29ybGQh;
+
+# Test hex implicit body:
+GET http://localhost:8000/compressed/zlib
+HTTP/1.0 200
+hex,48656c6c6f20576f726c6421;
+
+# Test file implicit body:
+GET http://localhost:8000/compressed/zlib
+HTTP/1.0 200
+file,hello.txt;
+
+
+# Brotli compressed body tests:
+# ---------------------------
+
 GET http://localhost:8000/compressed/brotli
 HTTP/1.0 200
 Content-Length: 17
@@ -46,6 +106,21 @@ sha256 == hex,7f83b1657ff1fc53b92dc18148a1d65dfc2d4b1fa3d677284addd200126d9069;
 md5 == hex,ed076287532e86365e841e92bfc50d8c;
 ```Hello World!```
 
+# Test base64 implicit body:
+GET http://localhost:8000/compressed/brotli
+HTTP/1.0 200
+base64,SGVsbG8gV29ybGQh;
+
+# Test hex implicit body:
+GET http://localhost:8000/compressed/brotli
+HTTP/1.0 200
+hex,48656c6c6f20576f726c6421;
+
+# Test file implicit body:
+GET http://localhost:8000/compressed/brotli
+HTTP/1.0 200
+file,hello.txt;
+
 GET http://localhost:8000/compressed/brotli_identity
 HTTP/1.0 200
 Content-Length: 17