Make tests re-runnable

devilbox · Mar 8, 2022 · 993d52b · 993d52b
1 parent b8b6498
commit 993d52b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/tests/00.sh b/tests/00.sh
@@ -48,8 +48,14 @@ run "docker run -d --rm --platform ${ARCH} \
 run "sleep 20"  # Startup-time is longer on cross-platform
 run "docker ps"
 run "docker logs ${RAND_NAME}"
-run "curl -sS localhost/index.html"
-run "curl -sS localhost/index.html | grep 'hello world'"
+if ! run "curl -sS localhost/index.html"; then
+	run "docker stop ${RAND_NAME}"
+	exit 1
+fi
+if ! run "curl -sS localhost/index.html | grep 'hello world'"; then
+	run "docker stop ${RAND_NAME}"
+	exit 1
+fi
 
 
 ###

diff --git a/tests/01.sh b/tests/01.sh
@@ -59,9 +59,16 @@ run "sleep 20"  # Startup-time is longer on cross-platform
 run "docker ps"
 run "docker logs ${RAND_NAME1}"
 run "docker logs ${RAND_NAME2}"
-run "curl localhost"
-run "curl localhost | grep 'hello world php'"
-
+if ! run "curl localhost"; then
+	run "docker stop ${RAND_NAME1}"
+	run "docker stop ${RAND_NAME2}"
+	exit 1
+fi
+if ! run "curl localhost | grep 'hello world php'"; then
+	run "docker stop ${RAND_NAME1}"
+	run "docker stop ${RAND_NAME2}"
+	exit 1
+fi
 
 ###
 ### Cleanup