close 'for' appropriately; clean also 'replica' subdir

diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index babc6ffcc843284d281688a64281e9877b3c7976..d6fe2d842438d12610a664e91dce68c2373f7286 100755 (executable)
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -40,7 +40,7 @@ fi
 echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 echo "Cleaning up in $REPLDIR..."
-rm -f $REPLDIR/[!C]*
+rm -rf $REPLDIR/[!C]*
 
 echo "Starting master slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND $MONITORDB < $MASTERCONF > $DBCONF
@@ -65,12 +65,12 @@ for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \
                'objectclass=*' > /dev/null 2>&1
        RC=$?
-done
        if test $RC = 0 ; then
                break
        fi
        echo "Waiting 5 seconds for slapd to start..."
        sleep 5
+done
 
 echo "Using ldapsearch to check that slave slapd is running..."
 for i in 0 1 2 3 4 5; do