Sync with HEAD for OL 2.4.5

[openldap] / tests / scripts / test023-refint

diff --git a/tests/scripts/test023-refint b/tests/scripts/test023-refint
index 78ac4d8c88104bf95b932bddbb7e1de7f373dede..3b16efa140932976e6df1ff8f742a767b060bfd6 100755 (executable)
--- a/tests/scripts/test023-refint
+++ b/tests/scripts/test023-refint
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2004 The OpenLDAP Foundation.
+## Copyright 2004-2007 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -13,6 +13,11 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+if test "$BACKEND" != "bdb" && test "$BACKEND" != "hdb" ; then
+       echo "Test does not support $BACKEND"
+       exit 0
+fi
+
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
@@ -41,6 +46,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd referential integrity operations..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -61,10 +68,7 @@ fi
 
 echo "Searching unmodified database..."
 
-$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 | \
-       egrep "(manager|secretary):" | sed "s/george/foster/g" | \
-       sort > $SEARCHOUT 2>&1
-
+$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
@@ -72,6 +76,9 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
+$EGREP_CMD "(manager|secretary):" $SEARCHOUT | sed "s/george/foster/g" | \
+       sort > $TESTOUT 2>&1
+
 echo "Testing modrdn..."
 $LDAPMODRDN -D "$REFINTDN" -r -h $LOCALHOST -p $PORT1 -w $PASSWD > \
        /dev/null 2>&1 'uid=george,ou=users,o=refint' 'uid=foster'
@@ -85,10 +92,11 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
+sleep 1;
+
 echo "Using ldapsearch to check dependents new rdn..."
 
-$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 | \
-       egrep "(manager|secretary):" | sort > $SEARCHFLT 2>&1
+$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1
 
 RC=$?
        if test $RC != 0 ; then
@@ -97,11 +105,14 @@ RC=$?
        exit $RC
 fi
 
+$EGREP_CMD "(manager|secretary):" $SEARCHOUT | sort > $SEARCHFLT 2>&1
+
 echo "Comparing ldapsearch results against original..."
-$CMP $SEARCHOUT $SEARCHOUT > $CMPOUT
+$CMP $TESTOUT $SEARCHFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "comparison failed - modify operations did not complete correctly"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit 1
 fi
 
@@ -120,9 +131,10 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
+sleep 1;
+
 echo "Using ldapsearch to verify dependents have been deleted..."
-$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 | \
-       egrep "(manager|secretary):" > $SEARCHFLT 2>&1
+$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1
 
 RC=$?
 if test $RC != 0 ; then
@@ -131,9 +143,12 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
+$EGREP_CMD "(manager|secretary):" $SEARCHOUT > $SEARCHFLT 2>&1
+
 RC=`grep -c foster $SEARCHFLT`
 if test $RC != 0 ; then
        echo "dependent modify failed - dependents were not deleted"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit 1
 fi
 
@@ -171,11 +186,85 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
+if test $BACKEND = "hdb" ; then
+       $LDAPMODIFY -v -D "$REFINTDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
+               $TESTOUT 2>&1 << EDEL
+version: 1
+dn: cn=group,o=refint
+changetype: add
+objectClass: groupOfNames
+cn: group
+member: uid=bill,ou=users,o=refint
+member: uid=bob,ou=users,o=refint
+member: uid=dave,ou=users,o=refint
+member: uid=jorge,ou=users,o=refint
+member: uid=theman,ou=users,o=refint
+member: uid=richard,ou=users,o=refint
+EDEL
+
+       RC=$?
+       if test $RC != 0 ; then
+               echo "ldapmodify failed ($RC)!"
+               test $KILLSERVERS != no && kill -HUP $KILLPIDS
+               exit $RC
+       fi
+
+       sleep 1;
+
+       $LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 \
+               manager member secretary > $SEARCHOUT 2>&1
+       RC=$?
+       if test $RC != 0 ; then
+               echo "ldapsearch failed ($RC)!"
+               test $KILLSERVERS != no && kill -HUP $KILLPIDS
+               exit $RC
+       fi
+
+       $EGREP_CMD "(manager|member|secretary):" $SEARCHOUT \
+               | sed "s/ou=users/ou=people/g" | \
+               sort > $TESTOUT 2>&1
+
+       echo "testing subtree rename"
+       $LDAPMODRDN -D "$REFINTDN" -r -h $LOCALHOST -p $PORT1 -w $PASSWD > \
+               /dev/null 2>&1 'ou=users,o=refint' 'ou=people'
+       RC=$?
+       if test $RC != 0 ; then
+               echo "ldapmodrdn failed ($RC)!"
+               test $KILLSERVERS != no && kill -HUP $KILLPIDS
+               exit $RC
+       fi
+
+       sleep 1;
+
+       echo "Using ldapsearch to check dependents new rdn..."
 
+       $LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 \
+               manager member secretary > $SEARCHOUT 2>&1
 
-#####
+       RC=$?
+       if test $RC != 0 ; then
+               echo "ldapsearch failed ($RC)!"
+               test $KILLSERVERS != no && kill -HUP $KILLPIDS
+               exit $RC
+       fi
+
+       $EGREP_CMD "(manager|member|secretary):" $SEARCHOUT \
+               | sort > $SEARCHFLT 2>&1
+
+       echo "Comparing ldapsearch results against original..."
+       $CMP $TESTOUT $SEARCHFLT > $CMPOUT
+
+       if test $? != 0 ; then
+               echo "comparison failed - subtree rename operations did not complete correctly"
+               test $KILLSERVERS != no && kill -HUP $KILLPIDS
+               exit 1
+       fi
+fi
 
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0