tests: simplify temporary file management

Since we rely heavily on temporary files in tests, make
sure management of them is easy and reliable.

7 files changed, 19 insertions, 34 deletions

diff --git a/t/bin/unused_listen b/t/bin/unused_listen
index c13f97d..d0ab24a 100755
--- a/t/bin/unused_listen
+++ b/t/bin/unused_listen
@@ -36,4 +36,4 @@ rescue Errno::EEXIST
   retry
 end
 sock.close rescue nil
-puts "listen=#{addr}:#{port} lock_path=#{lock_path}"
+puts %Q(listen=#{addr}:#{port} _TEST_RM_LIST="$_TEST_RM_LIST #{lock_path}")
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 650e7de..1ba3f43 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -2,11 +2,7 @@
 . ./test-lib.sh
 
 eval $(unused_listen)
-pid=$(mktemp -t rainbows.$$.pid.XXXXXXXX)
-tmp=$(mktemp -t rainbows.$$.err.XXXXXXXX)
-ok=$(mktemp -t rainbows.$$.ok.XXXXXXXX)
-fifo=$(mktemp -t rainbows.$$.fifo.XXXXXXXX)
-TEST_RM_LIST="$TEST_RM_LIST $lock_path $pid $tmp $ok $fifo"
+rtmpfiles pid tmp ok fifo
 
 rm -f $fifo
 mkfifo $fifo
diff --git a/t/t1000-thread-pool-basic.sh b/t/t1000-thread-pool-basic.sh
index 905d077..68b98ac 100755
--- a/t/t1000-thread-pool-basic.sh
+++ b/t/t1000-thread-pool-basic.sh
@@ -2,12 +2,7 @@
 . ./test-lib.sh
 
 eval $(unused_listen)
-unicorn_config=$(mktemp -t rainbows.$$.unicorn.rb.XXXXXXXX)
-curl_out=$(mktemp -t rainbows.$$.curl.out.XXXXXXXX)
-curl_err=$(mktemp -t rainbows.$$.curl.err.XXXXXXXX)
-pid=$(mktemp -t rainbows.$$.pid.XXXXXXXX)
-TEST_RM_LIST="$TEST_RM_LIST $unicorn_config $lock_path $pid"
-TEST_RM_LIST="$TEST_RM_LIST $curl_out $curl_err"
+rtmpfiles unicorn_config curl_out curl_err pid
 
 nr_client=30
 nr_thread=10
diff --git a/t/t2000-thread-spawn-basic.sh b/t/t2000-thread-spawn-basic.sh
index 366ceec..da60d00 100755
--- a/t/t2000-thread-spawn-basic.sh
+++ b/t/t2000-thread-spawn-basic.sh
@@ -2,12 +2,7 @@
 . ./test-lib.sh
 
 eval $(unused_listen)
-unicorn_config=$(mktemp -t rainbows.$$.unicorn.rb.XXXXXXXX)
-curl_out=$(mktemp -t rainbows.$$.curl.out.XXXXXXXX)
-curl_err=$(mktemp -t rainbows.$$.curl.err.XXXXXXXX)
-pid=$(mktemp -t rainbows.$$.pid.XXXXXXXX)
-TEST_RM_LIST="$TEST_RM_LIST $unicorn_config $lock_path $pid"
-TEST_RM_LIST="$TEST_RM_LIST $curl_out $curl_err"
+rtmpfiles unicorn_config curl_out curl_err pid
 
 nr_client=30
 nr_thread=10
diff --git a/t/t3000-revactor-basic.sh b/t/t3000-revactor-basic.sh
index eb8741e..0341863 100755
--- a/t/t3000-revactor-basic.sh
+++ b/t/t3000-revactor-basic.sh
@@ -3,12 +3,7 @@
 require_revactor
 
 eval $(unused_listen)
-unicorn_config=$(mktemp -t rainbows.$$.unicorn.rb.XXXXXXXX)
-curl_out=$(mktemp -t rainbows.$$.curl.out.XXXXXXXX)
-curl_err=$(mktemp -t rainbows.$$.curl.err.XXXXXXXX)
-pid=$(mktemp -t rainbows.$$.pid.XXXXXXXX)
-TEST_RM_LIST="$TEST_RM_LIST $pid $unicorn_config $lock_path"
-TEST_RM_LIST="$TEST_RM_LIST $curl_out $curl_err"
+rtmpfiles unicorn_config curl_out curl_err pid
 
 nr_client=30
 nr_actor=10
diff --git a/t/t3100-revactor-tee-input.sh b/t/t3100-revactor-tee-input.sh
index eb17a8b..8c97b3a 100755
--- a/t/t3100-revactor-tee-input.sh
+++ b/t/t3100-revactor-tee-input.sh
@@ -7,14 +7,7 @@ require_revactor
 test -r random_blob || die "random_blob required, run with 'make $0'"
 
 eval $(unused_listen)
-unicorn_config=$(mktemp -t rainbows.$$.unicorn.rb.XXXXXXXX)
-curl_out=$(mktemp -t rainbows.$$.curl.out.XXXXXXXX)
-curl_err=$(mktemp -t rainbows.$$.curl.err.XXXXXXXX)
-r_err=$(mktemp -t rainbows.$$.r.err.XXXXXXXX)
-r_out=$(mktemp -t rainbows.$$.r.out.XXXXXXXX)
-pid=$(mktemp -t rainbows.$$.pid.XXXXXXXX)
-TEST_RM_LIST="$TEST_RM_LIST $unicorn_config $lock_path $r_err $r_out"
-TEST_RM_LIST="$TEST_RM_LIST $curl_out $curl_err $pid"
+rtmpfiles unicorn_config curl_out curl_err r_err r_out pid
 
 cat > $unicorn_config <<EOF
 listen "$listen"
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 5551378..c8e069d 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -15,8 +15,8 @@ die () {
         exit 1
 }
 
-TEST_RM_LIST=""
-trap 'rm -f $TEST_RM_LIST' 0
+_TEST_RM_LIST=""
+trap 'rm -f $_TEST_RM_LIST' 0
 PATH=$PWD/bin:$PATH
 export PATH
 
@@ -39,3 +39,14 @@ require_revactor () {
                 exit 0
         fi
 }
+
+# given a list of variable names, create temporary files and assign
+# the pathnames to those variables
+rtmpfiles () {
+        for id in "$@"
+        do
+                _tmp=$(mktemp -t rainbows.$$.$id.XXXXXXXX)
+                eval "$id=$_tmp"
+                _TEST_RM_LIST="$_TEST_RM_LIST $_tmp"
+        done
+}