From 112fe9265b4f5b3504504a1a36cafad9c6ceffeb Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Mon, 5 Oct 2009 18:13:12 -0700
Subject: cleanup temporary file usage in tests

mktemp(1) requires files to end with "XXXXXXXX", not just have
that template anywhere.  Also, add pid files to the TEST_RM_LIST
since test failures can leave a pid file dangling.  Lastly,
since the config.ru files are 100% static, just check them
as standalone files in instead of allocating a tempfile on them
for easier maintenance.
---
 t/t0000-basic.sh              | 13 +++----------
 t/t0000.ru                    |  3 +++
 t/t1000-thread-pool-basic.sh  | 22 ++++++----------------
 t/t1000.ru                    |  6 ++++++
 t/t2000-thread-spawn-basic.sh | 22 ++++++----------------
 t/t2000.ru                    |  6 ++++++
 t/t3000-revactor-basic.sh     | 22 ++++++----------------
 t/t3000.ru                    |  6 ++++++
 t/t3100-revactor-tee-input.sh |  2 +-
 9 files changed, 43 insertions(+), 59 deletions(-)
 create mode 100644 t/t0000.ru
 create mode 100644 t/t1000.ru
 create mode 100644 t/t2000.ru
 create mode 100644 t/t3000.ru

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 7c5c754..03c0dfe 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -2,17 +2,10 @@
 . ./test-lib.sh
 
 eval $(unused_listen)
-config_ru=$(mktemp -t rainbows.$$.XXXXXXXX.config.ru)
-pid=$(mktemp -t rainbows.$$.XXXXXXXX.pid)
-TEST_RM_LIST="$TEST_RM_LIST $config_ru $lock_path"
+pid=$(mktemp -t rainbows.$$.pid.XXXXXXXX)
+TEST_RM_LIST="$TEST_RM_LIST $lock_path $pid"
 
-cat > $config_ru <<\EOF
-use Rack::ContentLength
-use Rack::ContentType
-run lambda { |env| [ 200, {}, [ env.inspect << "\n" ] ] }
-EOF
-
-rainbows $config_ru -l $listen --pid $pid &
+rainbows t0000.ru -l $listen --pid $pid &
 wait_for_pid $pid
 curl -sSfv http://$listen/
 kill $(cat $pid)
diff --git a/t/t0000.ru b/t/t0000.ru
new file mode 100644
index 0000000..c2355da
--- /dev/null
+++ b/t/t0000.ru
@@ -0,0 +1,3 @@
+use Rack::ContentLength
+use Rack::ContentType
+run lambda { |env| [ 200, {}, [ env.inspect << "\n" ] ] }
diff --git a/t/t1000-thread-pool-basic.sh b/t/t1000-thread-pool-basic.sh
index 109f5ae..905d077 100755
--- a/t/t1000-thread-pool-basic.sh
+++ b/t/t1000-thread-pool-basic.sh
@@ -2,23 +2,13 @@
 . ./test-lib.sh
 
 eval $(unused_listen)
-config_ru=$(mktemp -t rainbows.$$.XXXXXXXX.config.ru)
-unicorn_config=$(mktemp -t rainbows.$$.XXXXXXXX.unicorn.rb)
-curl_out=$(mktemp -t rainbows.$$.XXXXXXXX.curl.out)
-curl_err=$(mktemp -t rainbows.$$.XXXXXXXX.curl.err)
-pid=$(mktemp -t rainbows.$$.XXXXXXXX.pid)
-TEST_RM_LIST="$TEST_RM_LIST $config_ru $unicorn_config $lock_path"
+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"
 
-cat > $config_ru <<\EOF
-use Rack::ContentLength
-use Rack::ContentType
-run lambda { |env|
-  sleep 1
-  [ 200, {}, [ Thread.current.inspect << "\n" ] ]
-}
-EOF
-
 nr_client=30
 nr_thread=10
 
@@ -31,7 +21,7 @@ Rainbows! do
 end
 EOF
 
-rainbows -D $config_ru -c $unicorn_config
+rainbows -D t1000.ru -c $unicorn_config
 wait_for_pid $pid
 
 start=$(date +%s)
diff --git a/t/t1000.ru b/t/t1000.ru
new file mode 100644
index 0000000..e639023
--- /dev/null
+++ b/t/t1000.ru
@@ -0,0 +1,6 @@
+use Rack::ContentLength
+use Rack::ContentType
+run lambda { |env|
+  sleep 1
+  [ 200, {}, [ Thread.current.inspect << "\n" ] ]
+}
diff --git a/t/t2000-thread-spawn-basic.sh b/t/t2000-thread-spawn-basic.sh
index ff48cb5..366ceec 100755
--- a/t/t2000-thread-spawn-basic.sh
+++ b/t/t2000-thread-spawn-basic.sh
@@ -2,23 +2,13 @@
 . ./test-lib.sh
 
 eval $(unused_listen)
-config_ru=$(mktemp -t rainbows.$$.XXXXXXXX.config.ru)
-unicorn_config=$(mktemp -t rainbows.$$.XXXXXXXX.unicorn.rb)
-curl_out=$(mktemp -t rainbows.$$.XXXXXXXX.curl.out)
-curl_err=$(mktemp -t rainbows.$$.XXXXXXXX.curl.err)
-pid=$(mktemp -t rainbows.$$.XXXXXXXX.pid)
-TEST_RM_LIST="$TEST_RM_LIST $config_ru $unicorn_config $lock_path"
+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"
 
-cat > $config_ru <<\EOF
-use Rack::ContentLength
-use Rack::ContentType
-run lambda { |env|
-  sleep 1
-  [ 200, {}, [ Thread.current.inspect << "\n" ] ]
-}
-EOF
-
 nr_client=30
 nr_thread=10
 
@@ -31,7 +21,7 @@ Rainbows! do
 end
 EOF
 
-rainbows -D $config_ru -c $unicorn_config
+rainbows -D t2000.ru -c $unicorn_config
 wait_for_pid $pid
 
 start=$(date +%s)
diff --git a/t/t2000.ru b/t/t2000.ru
new file mode 100644
index 0000000..e639023
--- /dev/null
+++ b/t/t2000.ru
@@ -0,0 +1,6 @@
+use Rack::ContentLength
+use Rack::ContentType
+run lambda { |env|
+  sleep 1
+  [ 200, {}, [ Thread.current.inspect << "\n" ] ]
+}
diff --git a/t/t3000-revactor-basic.sh b/t/t3000-revactor-basic.sh
index 163e0db..eb8741e 100755
--- a/t/t3000-revactor-basic.sh
+++ b/t/t3000-revactor-basic.sh
@@ -3,23 +3,13 @@
 require_revactor
 
 eval $(unused_listen)
-config_ru=$(mktemp -t rainbows.$$.XXXXXXXX.config.ru)
-unicorn_config=$(mktemp -t rainbows.$$.XXXXXXXX.unicorn.rb)
-curl_out=$(mktemp -t rainbows.$$.XXXXXXXX.curl.out)
-curl_err=$(mktemp -t rainbows.$$.XXXXXXXX.curl.err)
-pid=$(mktemp -t rainbows.$$.XXXXXXXX.pid)
-TEST_RM_LIST="$TEST_RM_LIST $config_ru $unicorn_config $lock_path"
+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"
 
-cat > $config_ru <<\EOF
-use Rack::ContentLength
-use Rack::ContentType
-run lambda { |env|
-  Actor.sleep 1
-  [ 200, {}, [ Thread.current.inspect << "\n" ] ]
-}
-EOF
-
 nr_client=30
 nr_actor=10
 
@@ -32,7 +22,7 @@ Rainbows! do
 end
 EOF
 
-rainbows -D $config_ru -c $unicorn_config
+rainbows -D t3000.ru -c $unicorn_config
 wait_for_pid $pid
 
 start=$(date +%s)
diff --git a/t/t3000.ru b/t/t3000.ru
new file mode 100644
index 0000000..7053c1a
--- /dev/null
+++ b/t/t3000.ru
@@ -0,0 +1,6 @@
+use Rack::ContentLength
+use Rack::ContentType
+run lambda { |env|
+  Actor.sleep 1
+  [ 200, {}, [ Thread.current.inspect << "\n" ] ]
+}
diff --git a/t/t3100-revactor-tee-input.sh b/t/t3100-revactor-tee-input.sh
index 337000a..2cbc73b 100755
--- a/t/t3100-revactor-tee-input.sh
+++ b/t/t3100-revactor-tee-input.sh
@@ -14,7 +14,7 @@ r_out=$(mktemp -t rainbows.$$.r.out.XXXXXXXX)
 pid=$(mktemp -t rainbows.$$.pid.XXXXXXXX)
 blob=$(mktemp -t rainbows.$$.blob.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 $blob"
+TEST_RM_LIST="$TEST_RM_LIST $curl_out $curl_err $blob $pid"
 
 cat > $unicorn_config <<EOF
 listen "$listen"
-- 
cgit v1.2.3-24-ge0c7