From bf34080bf370807a2c16ba6efbfef1598fcb341d Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Mon, 9 Nov 2009 12:01:22 -0800
Subject: tests: extra check to avoid race in reopen logs test

In Unicorn, the master reopens logs before the workers do in
case the workers die while reopening logs.  But for our test
cases (and real-world usage) we need to ensure the workers have
reopened logs as well.
---
 t/t0003-reopen-logs.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 't')

diff --git a/t/t0003-reopen-logs.sh b/t/t0003-reopen-logs.sh
index 822de8b..910a0a5 100755
--- a/t/t0003-reopen-logs.sh
+++ b/t/t0003-reopen-logs.sh
@@ -3,7 +3,7 @@
 nr_client=${nr_client-2}
 . ./test-lib.sh
 
-t_plan 18 "reopen rotated logs"
+t_plan 19 "reopen rotated logs"
 
 t_begin "setup and startup" && {
 	rtmpfiles curl_out curl_err r_rot
@@ -44,6 +44,16 @@ t_begin "wait for rotated log to reappear" && {
 	done
 }
 
+t_begin "wait for worker to reopen logs" && {
+	nr=60
+	re="worker=.* done reopening logs"
+	while ! grep "$re" < $r_err >/dev/null && test $nr -ge 0
+	do
+		sleep 1
+		nr=$(( $nr - 1 ))
+	done
+}
+
 dbgcat r_rot
 dbgcat r_err
 
-- 
cgit v1.2.3-24-ge0c7