diff options
| author | Eric Wong <normalperson@yhbt.net> | 2010-10-28 08:40:12 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2010-10-28 08:41:44 +0000 |
| commit | 015635f877084cc05a9e6e4c1430c70279d0a04e (patch) | |
| tree | 1570868d2ecd3d509dc2949005b3b922e973aab3 /t/t0018-reload-restore-settings.sh | |
| parent | b06c6b3ac214bc598d499c994884113d5b106e90 (diff) | |
| download | rainbows-015635f877084cc05a9e6e4c1430c70279d0a04e.tar.gz | |
We need to ensure the old worker is really dead before sending requests after reloading.
Diffstat (limited to 't/t0018-reload-restore-settings.sh')
| -rw-r--r-- | t/t0018-reload-restore-settings.sh | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/t/t0018-reload-restore-settings.sh b/t/t0018-reload-restore-settings.sh index 24ee406..3a9471f 100644 --- a/t/t0018-reload-restore-settings.sh +++ b/t/t0018-reload-restore-settings.sh @@ -19,16 +19,8 @@ t_begin "clobber config and reload" && { stderr_path "$r_err" EOF kill -HUP $rainbows_pid - while ! egrep '(done|error) reloading' $r_err >/dev/null - do - sleep 1 - done - - grep 'done reloading' $r_err >/dev/null - while ! grep reaped $r_err >/dev/null - do - sleep 1 - done + wait_for_reload + wait_for_reap } t_begin "HTTP request confirms we're on the default model" && { @@ -41,15 +33,8 @@ t_begin "restore config and reload" && { > $r_err kill -HUP $rainbows_pid rainbows_wait_start - while ! egrep '(done|error) reloading' $r_err >/dev/null - do - sleep 1 - done - while ! grep reaped $r_err >/dev/null - do - sleep 1 - done - grep 'done reloading' $r_err >/dev/null + wait_for_reload + wait_for_reap } t_begin "HTTP request confirms we're back on the correct model" && { |