Sync with HEAD

[openldap] / tests / scripts / test022-ppolicy

diff --git a/tests/scripts/test022-ppolicy b/tests/scripts/test022-ppolicy
index 04109034e369287886c7f6297922d0d731bb3d94..7f55cd09bcb285563b4d4e8a48ef45340f3ac9a6 100755 (executable)
--- a/tests/scripts/test022-ppolicy
+++ b/tests/scripts/test022-ppolicy
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2006 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -36,6 +36,8 @@ KILLPIDS="$PID"
 USER="uid=nd, ou=People, dc=example, dc=com"
 PASS=testpassword
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -111,7 +113,7 @@ RC=$?
 if test $RC = 0 ; then
        echo "Password expiration failed ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
 fi
 
 COUNT=`grep "grace logins" $SEARCHOUT | wc -l`
@@ -206,7 +208,7 @@ RC=$?
 if test $RC = 0 ; then
        echo "ldapmodify failed ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
 fi
 
 echo "Testing forced reset..."
@@ -235,7 +237,7 @@ RC=$?
 if test $RC = 0 ; then
        echo "Forced reset failed ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
 fi
 
 COUNT=`grep "Operations are restricted" $SEARCHOUT | wc -l`
@@ -279,7 +281,7 @@ RC=$?
 if test $RC = 0 ; then
        echo "Safe modify test 1 failed ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
 fi
 
 sleep 2
@@ -303,7 +305,7 @@ RC=$?
 if test $RC = 0 ; then
        echo "Length requirement test failed ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
 fi
 COUNT=`grep "Password fails quality" $TESTOUT | wc -l`
 if test $COUNT != 1 ; then
@@ -329,7 +331,7 @@ RC=$?
 if test $RC = 0 ; then
        echo "Hashed length requirement test failed ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
 fi
 COUNT=`grep "Password fails quality" $TESTOUT | wc -l`
 if test $COUNT != 1 ; then
@@ -341,4 +343,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0