Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / tests / scripts / test020-proxycache

diff --git a/tests/scripts/test020-proxycache b/tests/scripts/test020-proxycache
index 02cbd0323f653d15669e9da018e4598451bde861..8f502ebe665c032df176b6b2f29310f501bf4ce3 100755 (executable)
--- a/tests/scripts/test020-proxycache
+++ b/tests/scripts/test020-proxycache
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2010 The OpenLDAP Foundation.
+## Copyright 1998-2012 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -152,7 +152,7 @@ fi
 grep "query template" $LOG2 > /dev/null
 RC=$?
 if test $RC != 0 ; then
-       echo "Debug messages unavailable, test aborted..."
+       echo "Debug messages unavailable, remaining test skipped..."
        test $KILLSERVERS != no && kill -HUP $KILLPIDS && wait
        exit 0
 fi
@@ -256,7 +256,7 @@ case $RC in
 0)
        echo "ldapsearch should have failed!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
        ;;
 4)
        echo "ldapsearch failed ($RC)"
@@ -283,7 +283,7 @@ case $RC in
 0)
        echo "ldapsearch should have failed!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
        ;;
 4)
        echo "ldapsearch failed ($RC)"
@@ -314,13 +314,13 @@ FIRST=$CNT
 # queries 2-6,8-10 are cacheable
 CACHEABILITY=0111110111
 grep CACHEABLE $LOG2 | awk '{ 
-               if ($2 == "NOT") 
+               if ($3 == "NOT") 
                        printf "Query %d not cacheable\n",NR
                else 
                        printf "Query %d cacheable\n",NR
        }' 
 CACHED=`grep CACHEABLE $LOG2 | awk '{ 
-               if ($2 == "NOT") 
+               if ($3 == "NOT") 
                        printf "0" 
                else 
                        printf "1" 
@@ -330,6 +330,8 @@ if test "$CACHEABILITY" = "$CACHED" ; then
        echo "Successfully verified cacheability"
 else 
        echo "Error in verifying cacheability"
+       echo "$CACHED"
+       echo "$CACHEABILITY"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit 1
 fi
@@ -406,7 +408,7 @@ case $RC in
 0)
        echo "ldapsearch should have failed!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
        ;;
 4)
        echo "ldapsearch failed ($RC)"
@@ -433,7 +435,7 @@ case $RC in
 0)
        echo "ldapsearch should have failed!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
        ;;
 4)
        echo "ldapsearch failed ($RC)"
@@ -466,7 +468,7 @@ fi
 ANSWERABILITY=1110011
 grep ANSWERABLE $LOG2 | awk "BEGIN {FIRST=$FIRST}"'{ 
                if (NR > FIRST) { 
-                       if ($2 == "NOT") 
+                       if ($3 == "NOT") 
                                printf "Query %d not answerable\n",NR
                        else 
                                printf "Query %d answerable\n",NR 
@@ -474,7 +476,7 @@ grep ANSWERABLE $LOG2 | awk "BEGIN {FIRST=$FIRST}"'{
        }' 
 ANSWERED=`grep ANSWERABLE $LOG2 | awk "BEGIN {FIRST=$FIRST}"'{ 
                if (NR > FIRST) { 
-                       if ($2 == "NOT") 
+                       if ($3 == "NOT") 
                                printf "0" 
                        else 
                                printf "1"
@@ -535,7 +537,7 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-SLEEP=`expr $PCACHETTR + $PCACHE_CCPERIOD`
+SLEEP=`expr $PCACHETTR + $PCACHE_CCPERIOD + 1`
 echo "Waiting $SLEEP seconds for cache to refresh"
 
 sleep $SLEEP
@@ -555,7 +557,7 @@ RC=$?
 if test $RC != 0 ; then
        echo "Refresh failed"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS && wait
-       exit 0
+       exit 1
 fi
 
 echo ""
@@ -580,7 +582,7 @@ RC=$?
 if test $RC != 0 ; then
        echo "Refresh failed"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS && wait
-       exit 0
+       exit 1
 fi
 
 CNT=`expr $CNT + 1`
@@ -602,7 +604,7 @@ RC=$?
 if test $RC != 0 ; then
        echo "Refresh failed"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS && wait
-       exit 0
+       exit 1
 fi
 
 echo ""
@@ -620,7 +622,7 @@ RC=`grep "CACH.* BIND" $LOG2 | wc -l`
 if test $RC != 3 ; then
        echo "ldappasswd didn't update the cache"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS && wait
-       exit 0
+       exit 1
 fi
 
 CNT=`expr $CNT + 1`
@@ -641,7 +643,7 @@ RC=`grep "CACH.* BIND" $LOG2 | wc -l`
 if test $RC != 4 ; then
        echo "Bind wasn't answered from cache"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS && wait
-       exit 0
+       exit 1
 fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS