X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fscripts%2Ftest020-proxycache;h=c6ec3db525b28933128a0edc797a9d6b8e3f7d70;hb=df479246f6aef59f1414557ecffbc380359c303c;hp=c428601b13b37bf40b1a3fc4f5a61768709a462b;hpb=17e9073104f62ec33f01e618545a8d5b860d887d;p=openldap
diff --git a/tests/scripts/test020-proxycache b/tests/scripts/test020-proxycache
index c428601b13..c6ec3db525 100755
--- a/tests/scripts/test020-proxycache
+++ b/tests/scripts/test020-proxycache
@@ -2,7 +2,7 @@
# $OpenLDAP$
## This work is part of OpenLDAP Software .
##
-## Copyright 1998-2004 The OpenLDAP Foundation.
+## Copyright 1998-2005 The OpenLDAP Foundation.
## All rights reserved.
##
## Redistribution and use in source and binary forms, with or without
@@ -13,7 +13,7 @@
## top-level directory of the distribution or, alternatively, at
## .
-CACHETTL=60
+CACHETTL="1m"
CACHE_ENTRY_LIMIT=10
. $SRCDIR/scripts/defines.sh
@@ -28,6 +28,11 @@ if test $BACKLDAP = "ldapno" ; then
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:
@@ -49,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 \
@@ -87,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 \
@@ -105,10 +114,13 @@ if test $RC != 0 ; then
exit $RC
fi
+cat /dev/null > $SLAVEOUT
+
echo "Making queries on the proxy cache..."
echo "Query 1: filter:(sn=Jon) attrs: all"
+echo "# Query 1: filter:(sn=Jon) attrs: all" >> $SLAVEOUT
$LDAPSEARCH -x -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
- 'sn=Jon' > $SLAVEOUT 2>&1
+ 'sn=Jon' >> $SLAVEOUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed ($RC)!"
@@ -117,6 +129,7 @@ if test $RC != 0 ; then
fi
echo "Query 2: filter:(|(cn=*Jon*)(sn=Jon*)) attrs:cn sn title uid"
+echo "# Query 2: filter:(|(cn=*Jon*)(sn=Jon*)) attrs:cn sn title uid" >> $SLAVEOUT
$LDAPSEARCH -x -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
'(|(cn=*Jon*)(sn=Jon*))' cn sn title uid >> $SLAVEOUT 2>&1
RC=$?
@@ -127,6 +140,7 @@ if test $RC != 0 ; then
fi
echo "Query 3: filter:(sn=Smith*) attrs:cn sn title uid"
+echo "# Query 3: filter:(sn=Smith*) attrs:cn sn title uid" >> $SLAVEOUT
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
'sn=Smith*' cn sn title uid >> $SLAVEOUT 2>&1
RC=$?
@@ -137,6 +151,7 @@ if test $RC != 0 ; then
fi
echo "Query 4: filter:(sn=Doe*) attrs:cn sn title uid"
+echo "# Query 4: filter:(sn=Doe*) attrs:cn sn title uid" >> $SLAVEOUT
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
'sn=Doe' cn sn title uid >> $SLAVEOUT 2>&1
RC=$?
@@ -147,6 +162,7 @@ if test $RC != 0 ; then
fi
echo "Query 5: filter:(uid=bjorn) attrs:mail postaladdress telephonenumber cn uid"
+echo "# Query 5: filter:(uid=bjorn) attrs:mail postaladdress telephonenumber cn uid" >> $SLAVEOUT
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
'uid=bjorn' mail postaladdress telephonenumber cn uid >> $SLAVEOUT 2>&1
RC=$?
@@ -157,6 +173,7 @@ if test $RC != 0 ; then
fi
echo "Query 6: filter:(mail=*@mail.alumni.example.com) cn sn title uid"
+echo "# Query 6: filter:(mail=*@mail.alumni.example.com) cn sn title uid" >> $SLAVEOUT
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
'mail=*@mail.alumni.example.com' cn sn title uid >> $SLAVEOUT 2>&1
RC=$?
@@ -167,6 +184,7 @@ if test $RC != 0 ; then
fi
echo "Query 7: filter:(mail=*) cn sn title uid"
+echo "# Query 7: filter:(mail=*) cn sn title uid" >> $SLAVEOUT
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
'mail=*' cn sn title uid >> $SLAVEOUT 2>&1
RC=$?
@@ -199,10 +217,8 @@ else
exit 1
fi
-echo "ANSWERABILITY RESULTS" >> $SLAVEOUT
-echo "" >> $SLAVEOUT
-
echo "Query 8: filter:(|(cn=*Jones)(sn=Jones)) attrs:cn sn title uid"
+echo "# Query 8: filter:(|(cn=*Jones)(sn=Jones)) attrs:cn sn title uid" >> $SLAVEOUT
$LDAPSEARCH -x -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
'(|(cn=*Jones)(sn=Jones))' cn sn title uid >> $SLAVEOUT 2>&1
RC=$?
@@ -213,6 +229,7 @@ if test $RC != 0 ; then
fi
echo "Query 9: filter:(sn=Smith) attrs:cn sn title uid"
+echo "# Query 9: filter:(sn=Smith) attrs:cn sn title uid" >> $SLAVEOUT
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
'sn=Smith' cn sn title uid >> $SLAVEOUT 2>&1
RC=$?
@@ -223,6 +240,7 @@ if test $RC != 0 ; then
fi
echo "Query 10: filter:(uid=bjorn) attrs:mail postaladdress telephonenumber cn uid"
+echo "# Query 10: filter:(uid=bjorn) attrs:mail postaladdress telephonenumber cn uid" >> $SLAVEOUT
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
'uid=bjorn' mail postaladdress telephonenumber cn uid >> $SLAVEOUT 2>&1
RC=$?
@@ -233,6 +251,7 @@ if test $RC != 0 ; then
fi
echo "Query 11: filter:(mail=jaj@mail.alumni.example.com) cn sn title uid"
+echo "# Query 11: filter:(mail=jaj@mail.alumni.example.com) cn sn title uid" >> $SLAVEOUT
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
'mail=jaj@mail.alumni.example.com' cn sn title uid >> $SLAVEOUT 2>&1
RC=$?
@@ -271,8 +290,12 @@ else
exit 1
fi
-echo "Comparing cache output..."
-$CMP $SLAVEOUT $PROXYCACHEOUT > $CMPOUT
+echo "Filtering ldapsearch results..."
+. $LDIFFILTER < $SLAVEOUT > $SEARCHFLT
+echo "Filtering original ldif..."
+. $LDIFFILTER < $PROXYCACHEOUT > $LDIFFLT
+echo "Comparing filter output..."
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
if test $? != 0 ; then
echo "Comparison failed"