From 0000e57c6097ee0f18fabacca8c1303de7e65f73 Mon Sep 17 00:00:00 2001
From: Mark Nottingham <mnot@mnot.net>
Date: Sun, 24 Mar 2024 22:17:15 +1100
Subject: [PATCH] set -euo pipefail

---
 test-browser.sh |  2 ++
 test-docker.sh  | 12 ++++++------
 test-host.sh    |  2 ++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/test-browser.sh b/test-browser.sh
index 6f07939..49e392f 100755
--- a/test-browser.sh
+++ b/test-browser.sh
@@ -2,6 +2,8 @@
 
 ## Run tests against a local browser on OSX.
 
+set -euo pipefail
+
 PORT=8000
 DOWNLOADS=~/Downloads
 PIDFILE=/tmp/http-cache-test-server.pid
diff --git a/test-docker.sh b/test-docker.sh
index 53c72d0..76d843a 100755
--- a/test-docker.sh
+++ b/test-docker.sh
@@ -2,6 +2,8 @@
 
 ## Run tests against a local docker image with common proxy/caches.
 
+set -euo pipefail
+
 PIDFILE=/tmp/http-cache-test-server.pid
 
 ALL_PROXIES=(squid nginx apache trafficserver varnish caddy nuster)
@@ -18,13 +20,11 @@ function usage {
 }
 
 function run {
-  TEST_ID="$1"
+  TEST_ID="${1}"
   shift
   PROXIES=( "$@" )
   # start test server
-  npm run --silent server --port=8000 --pidfile=$PIDFILE &
-
-  echo $DOCKER_PORTS
+  npm run --silent server --port=8000 --pidfile=${PIDFILE} &
 
   # run proxies container
   docker run --platform linux/amd64 --name=tmp_proxies ${DOCKER_PORTS} -dt mnot/proxy-cache-tests host.docker.internal \
@@ -54,8 +54,8 @@ function cleanup {
   docker rm tmp_nuster > /dev/null
 
   # stop test server
-  kill "$(cat $PIDFILE)" > /dev/null 2>&1
-  rm $PIDFILE
+  kill "$(cat ${PIDFILE})" > /dev/null 2>&1
+  rm ${PIDFILE}
 }
 
 function test_proxy {
diff --git a/test-host.sh b/test-host.sh
index 6a59078..16ebe82 100755
--- a/test-host.sh
+++ b/test-host.sh
@@ -2,6 +2,8 @@
 
 ## Run tests against a host/port combination.
 
+set -euo pipefail
+
 function usage {
   if [[ -n "${1}" ]]; then
     echo "${1}"