fix timings and retry between syncrepl and server startup

diff --git a/tests/data/slapd-glue-syncrepl1.conf b/tests/data/slapd-glue-syncrepl1.conf
index dbfdbae5470b0193fe5eea1d844a141a85d58991..77172b6f58d6ecbdc17326e0d8a23ef99ce20538 100644 (file)
--- a/tests/data/slapd-glue-syncrepl1.conf
+++ b/tests/data/slapd-glue-syncrepl1.conf
@@ -81,7 +81,7 @@ syncrepl      rid=1
                schemachecking=off
                scope=sub
                type=refreshAndPersist
-               retry="10 3 300 5"
+               retry="3 3 300 5"
 updateref      @URI2@
 #overlay               syncprov
 

diff --git a/tests/data/slapd-glue-syncrepl2.conf b/tests/data/slapd-glue-syncrepl2.conf
index f2ef024dea36a8470b8e01cd90663b029ebd4304..b887b61433f6f3ae69ec70435c590619f10cc1a7 100644 (file)
--- a/tests/data/slapd-glue-syncrepl2.conf
+++ b/tests/data/slapd-glue-syncrepl2.conf
@@ -61,7 +61,7 @@ syncrepl      rid=2
                schemachecking=off
                scope=sub
                type=refreshAndPersist
-               retry="10 3 300 5"
+               retry="3 3 300 5"
 updateref      @URI1@
 #overlay               syncprov
 

diff --git a/tests/scripts/test033-glue-syncrepl b/tests/scripts/test033-glue-syncrepl
index 57d50b847710e0d3fc80d5cac9b8962096081875..31f5fc669d870fe98430f9355281793469716666 100755 (executable)
--- a/tests/scripts/test033-glue-syncrepl
+++ b/tests/scripts/test033-glue-syncrepl
@@ -42,18 +42,6 @@ KILLPIDS="$PID"
 
 sleep 1
 
-echo "Using ldapsearch to check that slapd 1 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
-
 echo "Starting slapd 2 on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $GLUESYNCCONF2 > $CONF2
 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
@@ -66,6 +54,18 @@ KILLPIDS="$KILLPIDS $PID"
 
 sleep 1
 
+echo "Using ldapsearch to check that slapd 1 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
+
 echo "Using ldapsearch to check that slapd 2 is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \
@@ -78,8 +78,9 @@ for i in 0 1 2 3 4 5; do
        sleep 5
 done
 
-echo "Waiting 15 seconds for shadow subtrees to sync..."
-sleep 15
+SLEEP=15
+echo "Waiting $SLEEP seconds for shadow subtrees to sync..."
+sleep $SLEEP
 
 for P in $PORT1 $PORT2 ; do
        echo "Using ldapsearch to read all the entries from port $P..."