X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest020-proxycache;h=0fc9f8b719b8cdbabf5bedb2fbafe802b1853324;hb=0dfc478cdf55c5b77203997f69ff98a40cef715f;hp=42e1cd36efda67fc2a340f97caa80b6bbc27a204;hpb=879e1d6133f79497446d2b6eef8763f7c16132c0;p=openldap
diff --git a/tests/scripts/test020-proxycache b/tests/scripts/test020-proxycache
index 42e1cd36ef..0fc9f8b719 100755
--- a/tests/scripts/test020-proxycache
+++ b/tests/scripts/test020-proxycache
@@ -1,16 +1,38 @@
#! /bin/sh
# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2005 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
CACHETTL=60
CACHE_ENTRY_LIMIT=10
. $SRCDIR/scripts/defines.sh
-if test $PROXYCACHE = no; then
- echo "Proxy caching requires back-meta AND (back-ldbm OR back-bdb)"
+if test $PROXYCACHE = pcacheno; then
+ echo "Proxy cache overlay not available, test skipped"
exit 0
fi
+if test $BACKLDAP = "ldapno" ; then
+ echo "LDAP backend not available, test skipped"
+ exit 0
+fi
+
+if test "x$LVL" = "x0" ; then
+ echo "test020 needs a minimal log level; setting to LDAP_DEBUG_NONE..."
+ LVL=2048
+fi
+
mkdir -p $TESTDIR $DBDIR1 $DBDIR2
# Test proxy caching:
@@ -32,6 +54,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
+sleep 1
+
echo "Using ldapsearch to check that master slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -70,6 +94,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$KILLPIDS $CACHEPID"
+sleep 1
+
echo "Using ldapsearch to check that proxy slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \
@@ -82,6 +108,12 @@ for i in 0 1 2 3 4 5; do
sleep 5
done
+if test $RC != 0 ; then
+ echo "ldapsearch failed ($RC)!"
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
+ exit $RC
+fi
+
echo "Making queries on the proxy cache..."
echo "Query 1: filter:(sn=Jon) attrs: all"
$LDAPSEARCH -x -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
@@ -133,7 +165,7 @@ if test $RC != 0 ; then
exit $RC
fi
-echo "Query 6: filter:(mail=*@example.com) cn sn title uid"
+echo "Query 6: filter:(mail=*@mail.alumni.example.com) cn sn title uid"
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
'mail=*@mail.alumni.example.com' cn sn title uid >> $SLAVEOUT 2>&1
RC=$?
@@ -168,7 +200,7 @@ CACHED=`grep CACHEABLE $LOG2 | awk '{
printf "1"
}'`
-if test $CACHEABILITY = $CACHED ; then
+if test "$CACHEABILITY" = "$CACHED" ; then
echo "Successfully verified cacheability"
else
echo "Error in verifying cacheability"
@@ -206,7 +238,7 @@ if test $RC != 0 ; then
exit $RC
fi
-echo "Query 11: filter:(mail=*@example.com) cn sn title uid"
+echo "Query 11: filter:(mail=jaj@mail.alumni.example.com) cn sn title uid"
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
'mail=jaj@mail.alumni.example.com' cn sn title uid >> $SLAVEOUT 2>&1
RC=$?
@@ -238,12 +270,22 @@ ANSWERED=`grep ANSWERABLE $LOG2 | awk '{
test $KILLSERVERS != no && kill -HUP $KILLPIDS
-if test $ANSWERABILITY = $ANSWERED ; then
+if test "$ANSWERABILITY" = "$ANSWERED" ; then
echo "Successfully verified answerability"
else
echo "Error in verifying answerability"
exit 1
fi
+echo "Filtering ldapsearch results..."
+. $LDIFFILTER < $SLAVEOUT > $SEARCHFLT
+echo "Comparing filter output..."
+$CMP $SEARCHFLT $PROXYCACHEOUT > $CMPOUT
+
+if test $? != 0 ; then
+ echo "Comparison failed"
+ exit 1
+fi
+
echo ">>>>> Test succeeded"
exit 0