Use shell "wait" instead of fixed 10 second wait-for-things-to-die

2026-01-04 22:20:28 -05:00 · 2006-01-11 05:25:09 +00:00 · 2006-01-11 05:25:09 +00:00 · 604f7fb9db
commit 604f7fb9db
parent de80985c95
48 changed files with 151 additions and 16 deletions
--- a/tests/scripts/all
+++ b/tests/scripts/all
@ -38,7 +38,7 @@ for CMD in $SRCDIR/scripts/test*; do
 		exit $RC
 	fi

-	echo ">>>>> waiting $SLEEPTIME seconds for things to exit"
-	sleep $SLEEPTIME
+#	echo ">>>>> waiting $SLEEPTIME seconds for things to exit"
+#	sleep $SLEEPTIME
 	echo ""
 done
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@ -81,4 +81,6 @@ else
 	fi
 fi

+test $KILLSERVERS != no && wait
+
 exit $RC
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@ -72,4 +72,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@ -77,4 +77,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@ -145,4 +145,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@ -228,4 +228,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@ -236,4 +236,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@ -534,4 +534,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@ -197,8 +197,8 @@ echo "Stopping the slave..."
 kill -HUP $SLAVEPID
 KILLPIDS="$PID $SLURPPID"

-echo "Waiting 5 seconds for slave slapd to die..."
-sleep 5
+echo "Waiting for slave slapd to die..."
+wait $SLAVEPID

 echo "Applying more changes to the master slapd..."
 $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
@ -223,8 +223,8 @@ echo "Stopping slurpd..."
 kill -HUP $SLURPPID
 KILLPIDS="$PID"

-echo "Waiting 5 seconds for slurpd to die..."
-sleep 5
+echo "Waiting for slurpd to die..."
+wait $SLURPPID

 echo "Applying more changes to the master slapd..."
 $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
@ -342,4 +342,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@ -86,4 +86,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test009-referral
+++ b/tests/scripts/test009-referral
@ -163,4 +163,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test010-passwd
+++ b/tests/scripts/test010-passwd
@ -183,4 +183,7 @@ $LDAPSEARCH -h $LOCALHOST -p $PORT1 \
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test011-glue-slapadd
+++ b/tests/scripts/test011-glue-slapadd
@ -90,4 +90,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test012-glue-populate
+++ b/tests/scripts/test012-glue-populate
@ -77,4 +77,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test013-language
+++ b/tests/scripts/test013-language
@ -111,4 +111,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test014-whoami
+++ b/tests/scripts/test014-whoami
@ -457,6 +457,9 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

 ## Note to developers: when SLAPD_DEBUG=-1 the command
--- a/tests/scripts/test015-xsearch
+++ b/tests/scripts/test015-xsearch
@ -235,4 +235,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test016-subref
+++ b/tests/scripts/test016-subref
@ -190,4 +190,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test017-syncreplication-refresh
+++ b/tests/scripts/test017-syncreplication-refresh
@ -263,4 +263,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test018-syncreplication-persist
+++ b/tests/scripts/test018-syncreplication-persist
@ -123,6 +123,7 @@ sleep 15

 echo "Stopping the provider, sleeping 10 seconds and restarting it..."
 kill -HUP "$PID"
+wait $PID
 sleep 10
 echo "RESTART" >> $LOG1
 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
@ -244,7 +245,7 @@ sleep 15

 echo "Stopping consumer to test recovery..."
 kill -HUP $SLAVEPID
-sleep 10
+wait $SLAVEPID

 echo "Modifying more entries on the master..."
 $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD >> \
@ -340,4 +341,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test019-syncreplication-cascade
+++ b/tests/scripts/test019-syncreplication-cascade
@ -451,4 +451,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test020-proxycache
+++ b/tests/scripts/test020-proxycache
@ -303,4 +303,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test021-certificate
+++ b/tests/scripts/test021-certificate
@ -316,4 +316,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test022-ppolicy
+++ b/tests/scripts/test022-ppolicy
@ -343,4 +343,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test023-refint
+++ b/tests/scripts/test023-refint
@ -185,4 +185,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test024-unique
+++ b/tests/scripts/test024-unique
@ -127,4 +127,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test025-limits
+++ b/tests/scripts/test025-limits
@ -1362,4 +1362,7 @@ esac
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test026-dn
+++ b/tests/scripts/test026-dn
@ -160,4 +160,7 @@ fi
 #####

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test027-emptydn
+++ b/tests/scripts/test027-emptydn
@ -75,7 +75,7 @@ if test $RC != 0 ; then
 	exit $RC
 fi

-test $KILLSERVERS != no && kill -HUP $KILLPIDS
+kill -HUP $KILLPIDS
 wait

 LDIFOUT=$EMPTYDNOUT1
@ -169,4 +169,7 @@ fi
 #####

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test028-idassert
+++ b/tests/scripts/test028-idassert
@ -248,5 +248,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
-exit 0

+test $KILLSERVERS != no && wait
+
+exit 0
--- a/tests/scripts/test029-ldapglue
+++ b/tests/scripts/test029-ldapglue
@ -218,5 +218,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
-exit 0

+test $KILLSERVERS != no && wait
+
+exit 0
--- a/tests/scripts/test030-relay
+++ b/tests/scripts/test030-relay
@ -103,5 +103,7 @@ for RELAY in $RELAYS ; do
 done

 echo ">>>>> Test succeeded"
-exit 0

+test $KILLSERVERS != no && wait
+
+exit 0
--- a/tests/scripts/test031-component-filter
+++ b/tests/scripts/test031-component-filter
@ -324,4 +324,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test032-chain
+++ b/tests/scripts/test032-chain
@ -307,5 +307,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
-exit 0

+test $KILLSERVERS != no && wait
+
+exit 0
--- a/tests/scripts/test033-glue-syncrepl
+++ b/tests/scripts/test033-glue-syncrepl
@ -161,4 +161,7 @@ done
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test034-translucent
+++ b/tests/scripts/test034-translucent
@ -203,7 +203,7 @@ fi

 echo "Shutting down local slapd..."
 kill -HUP $LOCALPID
-sleep 5
+wait $LOCALPID

 echo "Configuring local slapd without translucent_no_glue..."
 . $CONFFILTER $BACKEND $MONITORDB < $TRANSLUCENTLOCALCONF | \
@ -626,7 +626,7 @@ fi

 echo "Shutting down local slapd..."
 kill -HUP $LOCALPID
-sleep 5
+wait $LOCALPID

 echo "Configuring local slapd with translucent_strict..."
 echo translucent_strict >> $CONF2
@ -723,4 +723,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test035-meta
+++ b/tests/scripts/test035-meta
@ -720,5 +720,7 @@ esac
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
-exit 0

+test $KILLSERVERS != no && wait
+
+exit 0
--- a/tests/scripts/test036-meta-concurrency
+++ b/tests/scripts/test036-meta-concurrency
@ -224,4 +224,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test037-manage
+++ b/tests/scripts/test037-manage
@ -242,4 +242,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test038-retcode
+++ b/tests/scripts/test038-retcode
@ -106,4 +106,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test039-glue-ldap-concurrency
+++ b/tests/scripts/test039-glue-ldap-concurrency
@ -201,5 +201,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
-exit 0

+test $KILLSERVERS != no && wait
+
+exit 0
--- a/tests/scripts/test040-subtree-rename
+++ b/tests/scripts/test040-subtree-rename
@ -206,4 +206,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test041-aci
+++ b/tests/scripts/test041-aci
@ -255,4 +255,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test042-valsort
+++ b/tests/scripts/test042-valsort
@ -218,4 +218,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test043-delta-syncrepl
+++ b/tests/scripts/test043-delta-syncrepl
@ -344,4 +344,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test044-dynlist
+++ b/tests/scripts/test044-dynlist
@ -448,4 +448,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test045-syncreplication-proxied
+++ b/tests/scripts/test045-syncreplication-proxied
@ -697,4 +697,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
--- a/tests/scripts/test046-dds
+++ b/tests/scripts/test046-dds
@ -526,4 +526,7 @@ if test $? != 0 ; then
 fi

 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0