test compare in chain overlay

diff --git a/tests/scripts/test032-chain b/tests/scripts/test032-chain
index 7bf073a3fdb7ac50fdc3beff4c88b6bbb99f4690..0d930ceef838fa3e10a5a7240c8f0c025acadccc 100755 (executable)
--- a/tests/scripts/test032-chain
+++ b/tests/scripts/test032-chain
@@ -133,8 +133,31 @@ for P in $PORT1 $PORT2 ; do
                echo "comparison failed - chained search didn't succeed"
                test $KILLSERVERS != no && kill -HUP $KILLPIDS
                exit 1
-fi
+       fi
 
+       DN="cn=Mark Elliot,ou=Alumni Association,ou=People,$BASEDN"
+       echo "Comparing \"$DN\" on port $P..."
+       $LDAPCOMPARE -h $LOCALHOST -p $P "$DN" "cn:Mark Elliot"
+                > $TESTOUT 2>&1
+
+       RC=$?
+       if test $RC != 0 ; then
+               echo "ldapcompare failed ($RC)!"
+               test $KILLSERVERS != no && kill -HUP $KILLPIDS
+               exit $RC
+       fi
+
+       DN="ou=Other,$BASEDN"
+       echo "Comparing \"$DN\" on port $P with manageDSAit control..."
+       $LDAPCOMPARE -h $LOCALHOST -p $P -M "$DN" "ou:Other"
+                > $TESTOUT 2>&1
+
+       RC=$?
+       if test $RC != 0 ; then
+               echo "ldapcompare failed ($RC)!"
+               test $KILLSERVERS != no && kill -HUP $KILLPIDS
+               exit $RC
+       fi
 done
 
 #

diff --git a/tests/scripts/test033-glue-syncrepl b/tests/scripts/test033-glue-syncrepl
index 82e3f3b07c878463c33914a1f2d03b55b899b97f..75b876cf169f45a784648ff475d9874394ff5345 100755 (executable)
--- a/tests/scripts/test033-glue-syncrepl
+++ b/tests/scripts/test033-glue-syncrepl
@@ -79,7 +79,7 @@ for i in 0 1 2 3 4 5; do
        sleep 5
 done
 
-echo "Waiting 15 seconds for slapds to sync..."
+echo "Waiting 15 seconds for shadow subtrees to sync..."
 sleep 15
 
 for P in $PORT1 $PORT2 ; do
@@ -90,6 +90,7 @@ for P in $PORT1 $PORT2 ; do
 
        if test $RC != 0 ; then
                echo "ldapsearch failed ($RC)!"
+               test $KILLSERVERS != no && kill -HUP $KILLPIDS
                exit $RC
        fi
 
@@ -102,6 +103,7 @@ for P in $PORT1 $PORT2 ; do
 
        if test $? != 0 ; then
                echo "comparison failed - database was not created correctly"
+               test $KILLSERVERS != no && kill -HUP $KILLPIDS
                exit 1
        fi
 done