kill provider as well; cleanup replication tests

diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index 527c0013543c67757b5d4a4136b184c8b8fd2cc2..a31c3e4ecebb0ed79d47de429b29523f4eafcfbe 100755 (executable)
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -192,13 +192,13 @@ echo "Waiting 15 seconds for slurpd to send changes..."
 sleep 15
 
 echo "Stopping the slave..."
-kill $SLAVEPID
+kill -HUP $SLAVEPID
 KILLPIDS="$PID $SLURPPID"
 
 echo "Waiting 5 seconds for slave slapd to die..."
 sleep 5
 
-echo "Applying more changes..."
+echo "Applying more changes to the master slapd..."
 $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
        $TESTOUT 2>&1 << EOMODS
 dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com
@@ -218,13 +218,13 @@ fi
 
 
 echo "Stopping slurpd..."
-kill $SLURPPID
+kill -HUP $SLURPPID
 KILLPIDS="$PID"
 
 echo "Waiting 5 seconds for slurpd to die..."
 sleep 5
 
-echo "Applying more changes..."
+echo "Applying more changes to the master slapd..."
 $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
        $TESTOUT 2>&1 << EOMODS
 dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com
@@ -243,6 +243,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Restarting slave slapd on TCP/IP port $PORT2..."
+echo "RESTART" >> $LOG2
 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 &
 SLAVEPID=$!
 if test $WAIT != 0 ; then
@@ -263,7 +264,8 @@ for i in 0 1 2 3 4 5; do
        sleep 5
 done
 
-echo "Starting slurpd..."
+echo "Restarting slurpd..."
+echo "RESTART" >> $SLURPLOG
 $SLURPD -f $CONF1 -d ${SLURPD_DEBUG-5} -t $DBDIR1B >> $SLURPLOG 2>&1 &
 SLURPPID=$!
 if test $WAIT != 0 ; then

diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist
index cbdc604b494053524fc8df8af949bb4f78bf83a1..fd261b7f8a285b8c7f8bf5e607af71cb754fe00a 100755 (executable)
--- a/tests/scripts/test018-syncreplication-persist
+++ b/tests/scripts/test018-syncreplication-persist
@@ -117,6 +117,36 @@ fi
 echo "Waiting 15 seconds for syncrepl to receive changes..."
 sleep 15
 
+echo "Stopping the provider, sleeping 10 seconds and restarting it..."
+kill -HUP "$PID"
+sleep 10
+echo "RESTART" >> $LOG1
+$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
+KILLPIDS="$PID $SLAVEPID"
+
+echo "Using ldapsearch to check that master 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 "Using ldapmodify to modify master directory..."
 
 #

diff --git a/tests/scripts/test030-relay b/tests/scripts/test030-relay
index bae99ca513012c2a9788576aea425e2d756fdb23..656cc616f91cfc8d7a28538a9d13f918ce3b9d03 100755 (executable)
--- a/tests/scripts/test030-relay
+++ b/tests/scripts/test030-relay
@@ -62,7 +62,7 @@ if test "x$RELAYS" = "x" ; then
        exit 0
 fi
 
-echo "Testing virtual naming context mapping with backend(s) $RELAYS..."
+echo "Testing virtual naming context mapping with $RELAYS backend(s)..."
 echo ""
 
 first=1