From: Ryan Tandy <ryan@nardis.ca>
Date: Tue, 25 Apr 2017 01:28:25 +0000 (+0000)
Subject: ITS#8644 wait for slapd to start in test064
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b622163ecf14a179d932f779164af5e393311dd8;p=openldap

ITS#8644 wait for slapd to start in test064
---

diff --git a/tests/scripts/test064-constraint b/tests/scripts/test064-constraint
index 94f86be890..2ac53acb18 100755
--- a/tests/scripts/test064-constraint
+++ b/tests/scripts/test064-constraint
@@ -117,6 +117,23 @@ if test $WAIT != 0 ; then
 fi
 sleep 1
 
+echo "Using ldapsearch to check that slapd is running..."
+for i in 0 1 2 3 4 5; do
+	$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
+		'objectclass=*' > /dev/null 2>&1
+	RC=$?
+	if test $RC = 0 ; then
+		break
+	fi
+	echo "Waiting 5 seconds for slapd to start..."
+	sleep 5
+done
+if test $RC != 0 ; then
+	echo "ldapsearch failed ($RC)!"
+	test $KILLSERVERS != no && kill -HUP $KILLPIDS
+	exit $RC
+fi
+
 echo "Adding basic structure..."
 $LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD -f $ROOTLDIF &>/dev/null
 RC=$?