about summary refs log tree commit homepage
path: root/t/t0014-config-conflict.sh
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2010-10-28 08:40:12 +0000
committerEric Wong <normalperson@yhbt.net>2010-10-28 08:41:44 +0000
commit015635f877084cc05a9e6e4c1430c70279d0a04e (patch)
tree1570868d2ecd3d509dc2949005b3b922e973aab3 /t/t0014-config-conflict.sh
parentb06c6b3ac214bc598d499c994884113d5b106e90 (diff)
downloadrainbows-015635f877084cc05a9e6e4c1430c70279d0a04e.tar.gz
We need to ensure the old worker is really dead before sending
requests after reloading.
Diffstat (limited to 't/t0014-config-conflict.sh')
-rwxr-xr-xt/t0014-config-conflict.sh8
1 files changed, 2 insertions, 6 deletions
diff --git a/t/t0014-config-conflict.sh b/t/t0014-config-conflict.sh
index b91355d..b06c915 100755
--- a/t/t0014-config-conflict.sh
+++ b/t/t0014-config-conflict.sh
@@ -30,12 +30,8 @@ t_begin "modify rackup file" && {
 t_begin "reload signal succeeds" && {
         kill -HUP $rainbows_pid
         rainbows_wait_start
-        while ! egrep '(done|error) reloading' < $r_err >/dev/null
-        do
-                sleep 1
-        done
-
-        grep 'done reloading' $r_err >/dev/null
+        wait_for_reload
+        wait_for_reap
 }
 
 t_begin "hit with curl" && {