From 5aa29fb8b57dc2bcd5ca976e37e447714f0301ec Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Thu, 31 Mar 2022 08:44:20 -0400
Subject: [PATCH] test: fix expect tests, make them more robust (timeout),
 correct upload test

---
 tests/download_chunked.sh | 6 +++---
 tests/echo1.sh            | 8 ++++----
 tests/sse_count.sh        | 2 +-
 tests/upload-out.expect   | 2 +-
 tests/upload_chunked.sh   | 3 ++-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/tests/download_chunked.sh b/tests/download_chunked.sh
index 7b065f6c..5ee1e1b2 100755
--- a/tests/download_chunked.sh
+++ b/tests/download_chunked.sh
@@ -9,15 +9,15 @@ sleep 0.1
 
 echo download1 1>&2
 curl -N "http://localhost:${PORT}/foo_50" -o data21 \
-  -H 'Tranfer-encoding: chunked'
+  -H 'Tranfer-encoding: chunked' --max-time 10
 
 echo download2 1>&2
 curl -N "http://localhost:${PORT}/foo_50" -o data22 \
-  -H 'Tranfer-encoding: chunked'
+  -H 'Tranfer-encoding: chunked' --max-time 10
 
 echo download3 1>&2
 curl -N "http://localhost:${PORT}/foo_50" -o data23 \
-  -H 'Tranfer-encoding: chunked'
+  -H 'Tranfer-encoding: chunked' --max-time 10
 
 kill $PID
 wc data21 data22 data23
diff --git a/tests/echo1.sh b/tests/echo1.sh
index 90f7d204..b77cca57 100755
--- a/tests/echo1.sh
+++ b/tests/echo1.sh
@@ -6,15 +6,15 @@ PORT=8085
 "$ECHO" -p $PORT &
 PID=$!
 sleep 0.1
-curl -N "http://localhost:${PORT}/echo/?a=b&c=d" -H user-agent:test
+curl -N "http://localhost:${PORT}/echo/?a=b&c=d" -H user-agent:test --max-time 5
 
 sleep 0.1
-curl -N "http://localhost:${PORT}/vfs/"
+curl -N "http://localhost:${PORT}/vfs/" --max-time 5
 
 sleep 0.1
-curl -N "http://localhost:${PORT}/vfs/a.txt"
+curl -N "http://localhost:${PORT}/vfs/a.txt" --max-time 5
 
 sleep 0.1
-curl -N "http://localhost:${PORT}/vfs/sub/yolo.html"
+curl -N "http://localhost:${PORT}/vfs/sub/yolo.html" --max-time 5
 
 kill $PID
diff --git a/tests/sse_count.sh b/tests/sse_count.sh
index dcd0c352..aebd6aea 100755
--- a/tests/sse_count.sh
+++ b/tests/sse_count.sh
@@ -7,5 +7,5 @@ PORT=8086
 PID=$!
 sleep 0.1
 
-curl -N "http://localhost:${PORT}/count/10" -H user-agent:test
+curl -N "http://localhost:${PORT}/count/10" -H user-agent:test --max-time 10
 kill $PID
diff --git a/tests/upload-out.expect b/tests/upload-out.expect
index 71126e49..7c5ca0cc 100644
--- a/tests/upload-out.expect
+++ b/tests/upload-out.expect
@@ -1,2 +1,2 @@
 serve directory . on http://127.0.0.1:8087
-server error: Invalid_argument("Bytes.blit")0 0 0 data
+upload successful       0        0 52428800 data
diff --git a/tests/upload_chunked.sh b/tests/upload_chunked.sh
index a574798d..5afebaca 100755
--- a/tests/upload_chunked.sh
+++ b/tests/upload_chunked.sh
@@ -10,7 +10,8 @@ PID=$!
 
 sleep 0.1
 
-cat foo_50 | curl -N -X PUT http://localhost:$PORT/data --data-binary @- -H 'Transfer-Encoding: chunked'
+cat foo_50 | curl -N -X PUT http://localhost:$PORT/data --data-binary @- \
+  -H 'Transfer-Encoding: chunked' --max-time 10
 
 kill $PID
 wc data