]> git.sur5r.net Git - openldap/commitdiff
ITS#8644 wait for slapd to start in test064
authorRyan Tandy <ryan@nardis.ca>
Tue, 25 Apr 2017 01:28:25 +0000 (01:28 +0000)
committerRyan Tandy <ryan@nardis.ca>
Tue, 25 Apr 2017 01:37:18 +0000 (01:37 +0000)
tests/scripts/test064-constraint

index 94f86be890b78b01607cc2a3b56e684703c66c54..2ac53acb18f9ea79adc01b810b6273abeb681cf2 100755 (executable)
@@ -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=$?