From 95bd43f95375c79255016f867b7cc524c6b27db8 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Mon, 12 Oct 2009 00:26:46 -0700
Subject: tests: check for common exceptions with "Error"

And fix existing tests that use "grep -v" since that
is almost always true...
---
 t/t1000-thread-pool-basic.sh     | 6 +++++-
 t/t1002-thread-pool-graceful.sh  | 2 +-
 t/t2000-thread-spawn-basic.sh    | 5 ++++-
 t/t2002-thread-spawn-graceful.sh | 2 +-
 t/t3000-revactor-basic.sh        | 5 ++++-
 t/t3001-revactor-pipeline.sh     | 5 ++++-
 t/t3002-revactor-graceful.sh     | 2 +-
 t/t3100-revactor-tee-input.sh    | 1 +
 8 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/t/t1000-thread-pool-basic.sh b/t/t1000-thread-pool-basic.sh
index 68b98ac..1510ab6 100755
--- a/t/t1000-thread-pool-basic.sh
+++ b/t/t1000-thread-pool-basic.sh
@@ -2,12 +2,14 @@
 . ./test-lib.sh
 
 eval $(unused_listen)
-rtmpfiles unicorn_config curl_out curl_err pid
+rtmpfiles unicorn_config curl_out curl_err pid r_err r_out
 
 nr_client=30
 nr_thread=10
 
 cat > $unicorn_config <<EOF
+stderr_path "$r_err"
+stdout_path "$r_out"
 listen "$listen"
 pid "$pid"
 Rainbows! do
@@ -36,3 +38,5 @@ nr=$(sort < $curl_out | uniq | wc -l)
 
 test "$nr" -le $nr_thread
 test "$nr" -gt 1
+
+! grep Error $r_err
diff --git a/t/t1002-thread-pool-graceful.sh b/t/t1002-thread-pool-graceful.sh
index 48f9363..0830bc7 100755
--- a/t/t1002-thread-pool-graceful.sh
+++ b/t/t1002-thread-pool-graceful.sh
@@ -34,4 +34,4 @@ nr=$(sort < $curl_out | uniq | wc -l)
 
 test "$nr" -eq 1
 test x$(sort < $curl_out | uniq) = xHello
-grep -v Error $r_err
+! grep Error $r_err
diff --git a/t/t2000-thread-spawn-basic.sh b/t/t2000-thread-spawn-basic.sh
index da60d00..37aa029 100755
--- a/t/t2000-thread-spawn-basic.sh
+++ b/t/t2000-thread-spawn-basic.sh
@@ -2,12 +2,14 @@
 . ./test-lib.sh
 
 eval $(unused_listen)
-rtmpfiles unicorn_config curl_out curl_err pid
+rtmpfiles unicorn_config curl_out curl_err pid r_err r_out
 
 nr_client=30
 nr_thread=10
 
 cat > $unicorn_config <<EOF
+stderr_path "$r_err"
+stdout_path "$r_out"
 listen "$listen"
 pid "$pid"
 Rainbows! do
@@ -33,3 +35,4 @@ kill $(cat $pid)
 test x"$(wc -l < $curl_out)" = x$nr_client
 nr=$(sort < $curl_out | uniq | wc -l)
 test "$nr" -eq $nr_client
+! grep Error $r_err
diff --git a/t/t2002-thread-spawn-graceful.sh b/t/t2002-thread-spawn-graceful.sh
index 1eb1047..5a02670 100755
--- a/t/t2002-thread-spawn-graceful.sh
+++ b/t/t2002-thread-spawn-graceful.sh
@@ -34,4 +34,4 @@ nr=$(sort < $curl_out | uniq | wc -l)
 
 test "$nr" -eq 1
 test x$(sort < $curl_out | uniq) = xHello
-grep -v Error $r_err
+! grep Error $r_err
diff --git a/t/t3000-revactor-basic.sh b/t/t3000-revactor-basic.sh
index 0341863..29d9b98 100755
--- a/t/t3000-revactor-basic.sh
+++ b/t/t3000-revactor-basic.sh
@@ -3,7 +3,7 @@
 require_revactor
 
 eval $(unused_listen)
-rtmpfiles unicorn_config curl_out curl_err pid
+rtmpfiles unicorn_config curl_out curl_err pid r_err r_out
 
 nr_client=30
 nr_actor=10
@@ -11,6 +11,8 @@ nr_actor=10
 cat > $unicorn_config <<EOF
 listen "$listen"
 pid "$pid"
+stderr_path "$r_err"
+stdout_path "$r_out"
 Rainbows! do
   use :Revactor
   worker_connections $nr_actor
@@ -35,3 +37,4 @@ test x"$(wc -l < $curl_out)" = x$nr_client
 nr=$(sort < $curl_out | uniq | wc -l)
 
 test "$nr" -eq 1
+! grep Error $r_err
diff --git a/t/t3001-revactor-pipeline.sh b/t/t3001-revactor-pipeline.sh
index 94f1eb3..e5aa3ee 100755
--- a/t/t3001-revactor-pipeline.sh
+++ b/t/t3001-revactor-pipeline.sh
@@ -3,12 +3,14 @@
 require_revactor
 
 eval $(unused_listen)
-rtmpfiles unicorn_config curl_out curl_err pid fifo tmp ok
+rtmpfiles unicorn_config curl_out curl_err pid fifo tmp ok r_err r_out
 
 rm -f $fifo
 mkfifo $fifo
 
 cat > $unicorn_config <<EOF
+stderr_path "$r_err"
+stdout_path "$r_out"
 listen "$listen"
 pid "$pid"
 Rainbows! do
@@ -41,3 +43,4 @@ test 2 -eq $(grep '^HTTP/1.1 200 OK' $tmp | wc -l)
 test 1 -eq $(grep '^Connection: keep-alive' $tmp | wc -l)
 test 1 -eq $(grep '^Connection: close' $tmp | wc -l)
 test x"$(cat $ok)" = xok
+! grep Error $r_err
diff --git a/t/t3002-revactor-graceful.sh b/t/t3002-revactor-graceful.sh
index b1512b9..2a766be 100755
--- a/t/t3002-revactor-graceful.sh
+++ b/t/t3002-revactor-graceful.sh
@@ -35,4 +35,4 @@ nr=$(sort < $curl_out | uniq | wc -l)
 
 test "$nr" -eq 1
 test x$(sort < $curl_out | uniq) = xHello
-grep -v Error $r_err
+! grep Error $r_err
diff --git a/t/t3100-revactor-tee-input.sh b/t/t3100-revactor-tee-input.sh
index 8c97b3a..08ffd33 100755
--- a/t/t3100-revactor-tee-input.sh
+++ b/t/t3100-revactor-tee-input.sh
@@ -41,3 +41,4 @@ test 1 -eq $(sort < $curl_out | uniq | wc -l)
 blob_sha1=$( expr "$(sha1sum < random_blob)" : '\([a-f0-9]\+\)')
 echo blob_sha1=$blob_sha1
 test x"$blob_sha1" = x"$(sort < $curl_out | uniq)"
+! grep Error $r_err
-- 
cgit v1.2.3-24-ge0c7