From 5b56d48e4563f442b1364b6fc668cb7563152254 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sat, 17 Apr 2004 18:21:26 +0000 Subject: [PATCH] unambiguate last set of tests --- tests/data/slapd-limits.conf | 12 +++--- tests/scripts/test025-limits | 84 ++++++++++++++++++++++++++++-------- 2 files changed, 72 insertions(+), 24 deletions(-) diff --git a/tests/data/slapd-limits.conf b/tests/data/slapd-limits.conf index b37cf9524e..9be0262b89 100644 --- a/tests/data/slapd-limits.conf +++ b/tests/data/slapd-limits.conf @@ -45,9 +45,9 @@ limits dn.exact="cn=Soft Limited User,ou=People,o=University of Michigan,c=US" s limits dn.exact="cn=Hard Limited User,ou=People,o=University of Michigan,c=US" size.soft=4 size.hard=8 limits dn.exact="cn=Unchecked Limited User,ou=People,o=University of Michigan,c=US" size.unchecked=4 limits group="cn=Unchecked Limited Users,ou=Groups,o=University of Michigan,c=US" size.unchecked=4 -limits dn.regex="^cn=Foo User,ou=[^,]+,o=University of Michigan,c=US$" size.unchecked=4 -limits dn.onelevel="ou=People,o=University of Michigan,c=US" size.unchecked=4 -limits dn.children="ou=Groups,o=University of Michigan,c=US" size.unchecked=4 -limits dn.subtree="ou=Admin,o=University of Michigan,c=US" size.unchecked=4 -limits users size.unchecked=4 -limits anonymous size.unchecked=4 +limits dn.regex="^cn=Foo User,ou=[^,]+,o=University of Michigan,c=US$" size.soft=6 +limits dn.onelevel="ou=People,o=University of Michigan,c=US" size.soft=5 +limits dn.children="ou=Groups,o=University of Michigan,c=US" size.soft=4 +limits dn.subtree="ou=Admin,o=University of Michigan,c=US" size.soft=3 +limits users size.soft=2 +limits anonymous size.soft=1 diff --git a/tests/scripts/test025-limits b/tests/scripts/test025-limits index d098b97955..7e9c771c85 100755 --- a/tests/scripts/test025-limits +++ b/tests/scripts/test025-limits @@ -315,10 +315,18 @@ RC=$? COUNT=`cat $SEARCHOUT | grep '^# numEntries:' | sed 's;.*\([0-9]\+\)$;\1;'` case $RC in 0) - echo "...success; didn't bump into server-side unchecked limit (got $COUNT entries)" + echo "...success; didn't bump into either requested ($SIZELIMIT) or server-side size limit (got $COUNT entries)" ;; - 11) - echo "...bumped into server-side unchecked limit" + 4) + if test "x$COUNT" != "x" ; then + if test $SIZELIMIT = $COUNT ; then + echo "...bumped into requested ($SIZELIMIT) size limit" + else + echo "...bumped into server-side size limit ($COUNT)" + fi + else + echo "...bumped into either requested ($SIZELIMIT) or server-side size limit" + fi ;; *) echo "ldapsearch failed ($RC)!" @@ -335,10 +343,18 @@ RC=$? COUNT=`cat $SEARCHOUT | grep '^# numEntries:' | sed 's;.*\([0-9]\+\)$;\1;'` case $RC in 0) - echo "...success; didn't bump into server-side unchecked limit (got $COUNT entries)" + echo "...success; didn't bump into either requested ($SIZELIMIT) or server-side size limit (got $COUNT entries)" ;; - 11) - echo "...bumped into server-side unchecked limit" + 4) + if test "x$COUNT" != "x" ; then + if test $SIZELIMIT = $COUNT ; then + echo "...bumped into requested ($SIZELIMIT) size limit" + else + echo "...bumped into server-side size limit ($COUNT)" + fi + else + echo "...bumped into either requested ($SIZELIMIT) or server-side size limit" + fi ;; *) echo "ldapsearch failed ($RC)!" @@ -355,10 +371,18 @@ RC=$? COUNT=`cat $SEARCHOUT | grep '^# numEntries:' | sed 's;.*\([0-9]\+\)$;\1;'` case $RC in 0) - echo "...success; didn't bump into server-side unchecked limit (got $COUNT entries)" + echo "...success; didn't bump into either requested ($SIZELIMIT) or server-side size limit (got $COUNT entries)" ;; - 11) - echo "...bumped into server-side unchecked limit" + 4) + if test "x$COUNT" != "x" ; then + if test $SIZELIMIT = $COUNT ; then + echo "...bumped into requested ($SIZELIMIT) size limit" + else + echo "...bumped into server-side size limit ($COUNT)" + fi + else + echo "...bumped into either requested ($SIZELIMIT) or server-side size limit" + fi ;; *) echo "ldapsearch failed ($RC)!" @@ -375,10 +399,18 @@ RC=$? COUNT=`cat $SEARCHOUT | grep '^# numEntries:' | sed 's;.*\([0-9]\+\)$;\1;'` case $RC in 0) - echo "...success; didn't bump into server-side unchecked limit (got $COUNT entries)" + echo "...success; didn't bump into either requested ($SIZELIMIT) or server-side size limit (got $COUNT entries)" ;; - 11) - echo "...bumped into server-side unchecked limit" + 4) + if test "x$COUNT" != "x" ; then + if test $SIZELIMIT = $COUNT ; then + echo "...bumped into requested ($SIZELIMIT) size limit" + else + echo "...bumped into server-side size limit ($COUNT)" + fi + else + echo "...bumped into either requested ($SIZELIMIT) or server-side size limit" + fi ;; *) echo "ldapsearch failed ($RC)!" @@ -395,10 +427,18 @@ RC=$? COUNT=`cat $SEARCHOUT | grep '^# numEntries:' | sed 's;.*\([0-9]\+\)$;\1;'` case $RC in 0) - echo "...success; didn't bump into server-side unchecked limit (got $COUNT entries)" + echo "...success; didn't bump into either requested ($SIZELIMIT) or server-side size limit (got $COUNT entries)" ;; - 11) - echo "...bumped into server-side unchecked limit" + 4) + if test "x$COUNT" != "x" ; then + if test $SIZELIMIT = $COUNT ; then + echo "...bumped into requested ($SIZELIMIT) size limit" + else + echo "...bumped into server-side size limit ($COUNT)" + fi + else + echo "...bumped into either requested ($SIZELIMIT) or server-side size limit" + fi ;; *) echo "ldapsearch failed ($RC)!" @@ -414,10 +454,18 @@ RC=$? COUNT=`cat $SEARCHOUT | grep '^# numEntries:' | sed 's;.*\([0-9]\+\)$;\1;'` case $RC in 0) - echo "...success; didn't bump into server-side unchecked limit (got $COUNT entries)" + echo "...success; didn't bump into either requested ($SIZELIMIT) or server-side size limit (got $COUNT entries)" ;; - 11) - echo "...bumped into server-side unchecked limit" + 4) + if test "x$COUNT" != "x" ; then + if test $SIZELIMIT = $COUNT ; then + echo "...bumped into requested ($SIZELIMIT) size limit" + else + echo "...bumped into server-side size limit ($COUNT)" + fi + else + echo "...bumped into either requested ($SIZELIMIT) or server-side size limit" + fi ;; *) echo "ldapsearch failed ($RC)!" -- 2.39.5