ITS#2401 support tests for dynamically loaded backends

[openldap] / tests / scripts / test003-search

diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index c69cc2d797bde2083d1e29de0aabc4ecd2b69899..51d7fd6ff66df80eeb518a85a2e1c2e4fe0bdf34 100755 (executable)
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -5,18 +5,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
        SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-       BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-       MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-       WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -54,12 +44,13 @@ fi
 echo "Testing slapd searching..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \
-               'objectclass=*' > /dev/null 2>&1
+               '(objectclass=*)' > /dev/null 2>&1
        RC=$?
-       if test $RC = 1 ; then
-               echo "Waiting 5 seconds for slapd to start..."
-               sleep 5
+       if test $RC = 0 ; then
+               break
        fi
+       echo "Waiting 5 seconds for slapd to start..."
+       sleep 5
 done
 
 if test $RC != 0 ; then
@@ -72,7 +63,7 @@ cat /dev/null > $SEARCHOUT
 
 echo "Testing exact searching..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \
-       'sn=jensen' >> $SEARCHOUT 2>&1
+       '(sn=jENSEN)' >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
@@ -82,7 +73,7 @@ fi
 
 echo "Testing OR searching..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \
-       '(|(givenName=XX*YY*Z)(cn=)(undef=*)(objectclass=groupofnames)(sn=jones))' >> $SEARCHOUT 2>&1
+       '(|(givenname=Xx*yY*Z)(cn=)(undef=*)(objectclass=groupofnames)(sn=jones)(member=cn=Manager,o=University of Michigan,c=US))' >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
@@ -91,8 +82,8 @@ if test $RC != 0 ; then
 fi
 
 echo "Testing AND matching and ends-with searching..."
-$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \
-       '(&(objectclass=groupofnames)(cn=A*))' >> $SEARCHOUT 2>&1
+$LDAPSEARCH -S "" -b "ou=groups,$BASEDN" -s one -h $LOCALHOST -p $PORT \
+       '(&(objectclass=groupofnames)(cn=A*)(member=cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c=US))' >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
@@ -104,14 +95,25 @@ echo "Testing NOT searching..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \
        '(!(objectclass=pilotPerson))' >> $SEARCHOUT 2>&1
 RC=$?
+if test $RC != 0 ; then
+       echo "ldapsearch failed ($RC)!"
+       kill -HUP $PID
+       exit $RC
+fi
 
-kill -HUP $PID
-
+echo "Testing objectClass/attributeType inheritance ..."
+$LDAPSEARCH -M -a never -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \
+       '(&(objectClass=inetorgperson)(userid=uham))' \
+       "2.5.4.0" "userid" >> $SEARCHOUT 2>&1
+RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
+       kill -HUP $PID
        exit $RC
 fi
 
+
+kill -HUP $PID
 LDIF=$SEARCHOUTMASTER
 
 echo "Filtering ldapsearch results..."