upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-17 01:28:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update passwd-search to use current defines.sh variables.

Browse source 
Obey $WAIT (run -w) and $KILLSERVERS (run -k).
Bugfix: Set $RC before using it.
Handle invocation both with and without ./run; unsure what was intended.
This commit is contained in:
Hallvard Furuseth 2005-09-26 07:45:19 +00:00
parent 052a4ae6c4
commit a727de0367
1 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
tests/scripts/passwd-search
View file

@ -14,7 +14,7 @@
## <http://www.OpenLDAP.org/license.html>.
if test $# -eq 0 ; then
SRCDIR="."
test -z "$SRCDIR" && SRCDIR="."
else
SRCDIR=$1; shift
fi
@ -25,17 +25,24 @@ fi
echo "running defines.sh $SRCDIR $BACKEND"
. $SRCDIR/scripts/defines.sh
echo "Cleaning up in $DBDIR..."
if test -d "$TESTDIR"; then
echo "Cleaning up in $TESTDIR..."
/bin/rm -rf testrun/db.*
fi
mkdir -p $TESTDIR
rm -f $DBDIR/[!C]*
echo "Starting slapd on TCP/IP port $PORT..."
$SLAPD -f $PASSWDCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
echo "Starting slapd on TCP/IP port $PORT1..."
$SLAPD -f $PASSWDCONF -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
PID=$!
if test ${WAIT-0} != 0 ; then
echo PID $PID
read foo
fi
KILLPIDS="$PID"
echo "Testing slapd searching..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -L -b "$BASEDN" -h $LOCALHOST -p $PORT \
$LDAPSEARCH -L -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
'objectclass=*' > /dev/null 2>&1
RC=$?
if test $RC = 1 ; then
@ -46,66 +53,71 @@ done
if test $RC != 0 ; then
echo "ldapsearch failed!"
kill -HUP $PID
test "$KILLSERVERS" != no && kill -HUP $KILLPIDS
exit $RC
fi
cat /dev/null > $TESTOUT
echo "Testing base suffix searching..."
$LDAPSEARCH -L -S "" -b "$BASEDN" -s base -h $LOCALHOST -p $PORT \
$LDAPSEARCH -L -S "" -b "$BASEDN" -s base -h $LOCALHOST -p $PORT1 \
'(objectclass=*)' >> $TESTOUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed!"
kill -HUP $PID
test "$KILLSERVERS" != no && kill -HUP $KILLPIDS
exit $RC
fi
echo " ------------ " >> $TESTOUT
echo "Testing user searching..."
$LDAPSEARCH -L -S "" -b "uid=root,$BASEDN" -s base -h $LOCALHOST -p $PORT \
$LDAPSEARCH -L -S "" -b "uid=root,$BASEDN" -s base -h $LOCALHOST -p $PORT1 \
'(objectclass=*)' >> $TESTOUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed!"
kill -HUP $PID
test "$KILLSERVERS" != no && kill -HUP $KILLPIDS
exit $RC
fi
echo " ------------ " >> $TESTOUT
echo "Testing exact searching..."
$LDAPSEARCH -L -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \
$LDAPSEARCH -L -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
'(uid=root)' >> $TESTOUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed!"
kill -HUP $PID
test "$KILLSERVERS" != no && kill -HUP $KILLPIDS
exit $RC
fi
echo " ------------ " >> $TESTOUT
echo "Testing OR searching..."
$LDAPSEARCH -L -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \
$LDAPSEARCH -L -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
'(|(objectclass=person)(cn=root))' >> $TESTOUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed!"
kill -HUP $PID
test "$KILLSERVERS" != no && kill -HUP $KILLPIDS
exit $RC
fi
echo " ------------ " >> $TESTOUT
echo "Testing AND searching..."
$LDAPSEARCH -L -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \
$LDAPSEARCH -L -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
'(&(objectclass=person)(cn=root))' >> $TESTOUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed!"
kill -HUP $PID
test "$KILLSERVERS" != no && kill -HUP $KILLPIDS
exit $RC
fi
kill -HUP $PID
test "$KILLSERVERS" != no && kill -HUP $KILLPIDS
echo "Assuming everything is fine."
#echo "Comparing results"
@ -117,5 +129,4 @@ echo "Assuming everything is fine."
echo ">>>>> Test succeeded"
exit 0