From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 27 Jan 2014 03:15:56 +0000 (-0500)
Subject: Fix: tests: wait for consumerd to complete
X-Git-Tag: v2.5.0-rc1~250
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f76139921e301236823c5cb093c37ce237e3ae89;p=lttng-tools.git

Fix: tests: wait for consumerd to complete

Wait for consumerd to complete when stopping sessiond.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 968a6e613..c433d6c72 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -16,6 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 SESSIOND_BIN="lttng-sessiond"
+CONSUMERD_BIN="lttng-consumerd"
 RELAYD_BIN="lttng-relayd"
 LTTNG_BIN="lttng"
 BABELTRACE_BIN="babeltrace"
@@ -183,6 +184,11 @@ function stop_lttng_sessiond ()
 			out=$(pidof lt-$SESSIOND_BIN)
 			sleep 0.5
 		done
+		out=1
+		while [ -n "$out" ]; do
+			out=$(pidof $CONSUMERD_BIN)
+			sleep 0.5
+		done
 		pass "Kill session daemon"
 	fi
 }