From: Howard Chu Date: Fri, 30 Sep 2005 07:32:49 +0000 (+0000) Subject: Tweak slapd startup delays X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~345 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=572ca2db94b0e7af95e7ac16a91cb1ea3b3d136a;p=openldap Tweak slapd startup delays --- diff --git a/tests/scripts/relay b/tests/scripts/relay index a6ae27a4ff..b02c8e0b78 100755 --- a/tests/scripts/relay +++ b/tests/scripts/relay @@ -26,6 +26,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +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 \ diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse index 61c0f8cca2..cb928a1b6d 100755 --- a/tests/scripts/test000-rootdse +++ b/tests/scripts/test000-rootdse @@ -28,6 +28,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Using ldapsearch to retrieve the root DSE..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -b "" -s base -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd index fb1fc469dc..9236f28d3b 100755 --- a/tests/scripts/test001-slapadd +++ b/tests/scripts/test001-slapadd @@ -37,6 +37,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Using ldapsearch to retrieve all the entries..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1 diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate index fe24cb2f17..1b7b1e67a1 100755 --- a/tests/scripts/test002-populate +++ b/tests/scripts/test002-populate @@ -28,6 +28,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +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 \ diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search index cbbc9ee7ef..8646f919e9 100755 --- a/tests/scripts/test003-search +++ b/tests/scripts/test003-search @@ -45,6 +45,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd searching..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify index 53b237003e..649fde2c5a 100755 --- a/tests/scripts/test004-modify +++ b/tests/scripts/test004-modify @@ -36,6 +36,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd modify operations..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn index c8154149b0..d6c2e383df 100755 --- a/tests/scripts/test005-modrdn +++ b/tests/scripts/test005-modrdn @@ -36,6 +36,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd modrdn operations..." # Make sure we can search the database diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls index e93dbe9638..38da4d1bc0 100755 --- a/tests/scripts/test006-acls +++ b/tests/scripts/test006-acls @@ -44,6 +44,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd access control..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication index 8146f8299e..9d5db25b92 100755 --- a/tests/scripts/test007-replication +++ b/tests/scripts/test007-replication @@ -55,6 +55,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $SLAVEPID" +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 \ @@ -252,6 +254,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $SLAVEPID" +sleep 1 + echo "Using ldapsearch to check that slave slapd is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \ diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency index 3841c3345e..6ea541f0bf 100755 --- a/tests/scripts/test008-concurrency +++ b/tests/scripts/test008-concurrency @@ -36,6 +36,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +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 \ @@ -49,7 +51,8 @@ for i in 0 1 2 3 4 5; do done echo "Using tester for concurrent server access..." -$SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l 50 +time $SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l 50 +#$SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l 50 RC=$? if test $RC != 0 ; then diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral index 8fcd5b2ec6..24bcfc4246 100755 --- a/tests/scripts/test009-referral +++ b/tests/scripts/test009-referral @@ -50,6 +50,8 @@ fi KILLPIDS="$PID $SLAVEPID" +sleep 1 + echo "Testing for master slapd..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test010-passwd b/tests/scripts/test010-passwd index f80e00cea0..463422ac5f 100755 --- a/tests/scripts/test010-passwd +++ b/tests/scripts/test010-passwd @@ -28,6 +28,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +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 \ diff --git a/tests/scripts/test011-glue-slapadd b/tests/scripts/test011-glue-slapadd index f54e0b5098..6e931613bc 100755 --- a/tests/scripts/test011-glue-slapadd +++ b/tests/scripts/test011-glue-slapadd @@ -36,6 +36,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Using ldapsearch to retrieve all the entries..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1 diff --git a/tests/scripts/test012-glue-populate b/tests/scripts/test012-glue-populate index c45feec9d6..8593351b38 100755 --- a/tests/scripts/test012-glue-populate +++ b/tests/scripts/test012-glue-populate @@ -28,6 +28,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +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 \ diff --git a/tests/scripts/test013-language b/tests/scripts/test013-language index a9cef2320b..767a7611cb 100755 --- a/tests/scripts/test013-language +++ b/tests/scripts/test013-language @@ -28,6 +28,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +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 \ diff --git a/tests/scripts/test014-whoami b/tests/scripts/test014-whoami index 62734714ac..e0339031e2 100755 --- a/tests/scripts/test014-whoami +++ b/tests/scripts/test014-whoami @@ -37,6 +37,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +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 \ diff --git a/tests/scripts/test015-xsearch b/tests/scripts/test015-xsearch index 0adb6ebbdd..01592fb831 100755 --- a/tests/scripts/test015-xsearch +++ b/tests/scripts/test015-xsearch @@ -45,6 +45,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd searching..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test016-subref b/tests/scripts/test016-subref index c8326b8c2f..85e4a88a4a 100755 --- a/tests/scripts/test016-subref +++ b/tests/scripts/test016-subref @@ -38,6 +38,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd searching..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test017-syncreplication-refresh b/tests/scripts/test017-syncreplication-refresh index 3b01f1a0bf..eac4b5e851 100755 --- a/tests/scripts/test017-syncreplication-refresh +++ b/tests/scripts/test017-syncreplication-refresh @@ -43,6 +43,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 \ @@ -81,6 +83,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $SLAVEPID" +sleep 1 + echo "Using ldapsearch to check that slave slapd is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \ diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist index db2df02054..c0d364dad2 100755 --- a/tests/scripts/test018-syncreplication-persist +++ b/tests/scripts/test018-syncreplication-persist @@ -48,6 +48,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 \ @@ -86,6 +88,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $SLAVEPID" +sleep 1 + echo "Using ldapsearch to check that slave slapd is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT4 \ @@ -129,6 +133,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID $SLAVEPID" +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 \ diff --git a/tests/scripts/test019-syncreplication-cascade b/tests/scripts/test019-syncreplication-cascade index 3a599a7e1e..ddba1ce017 100755 --- a/tests/scripts/test019-syncreplication-cascade +++ b/tests/scripts/test019-syncreplication-cascade @@ -47,6 +47,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Using ldapsearch to check that master slapd (pid=$PID) is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ @@ -85,6 +87,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $SLAVEPID" +sleep 1 + echo "Using ldapsearch to check that R1 slave slapd (pid=$SLAVEPID) is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \ @@ -113,6 +117,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $SLAVEPID" +sleep 1 + echo "Using ldapsearch to check that R2 slave slapd (pid=$SLAVEPID) is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT3 \ @@ -141,6 +147,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $SLAVEPID" +sleep 1 + echo "Using ldapsearch to check that P1 slave slapd (pid=$SLAVEPID) is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT4 \ @@ -169,6 +177,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $SLAVEPID" +sleep 1 + echo "Using ldapsearch to check that P2 slave slapd (pid=$SLAVEPID) is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT5 \ @@ -197,6 +207,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $SLAVEPID" +sleep 1 + echo "Using ldapsearch to check that P3 slave slapd (pid=$SLAVEPID) is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT6 \ diff --git a/tests/scripts/test020-proxycache b/tests/scripts/test020-proxycache index b8c4340111..0fc9f8b719 100755 --- a/tests/scripts/test020-proxycache +++ b/tests/scripts/test020-proxycache @@ -54,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 \ @@ -92,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 \ diff --git a/tests/scripts/test021-certificate b/tests/scripts/test021-certificate index e9e5db579d..c1609c16aa 100755 --- a/tests/scripts/test021-certificate +++ b/tests/scripts/test021-certificate @@ -34,6 +34,7 @@ if test $RC != 0 ; then fi echo "Starting slapd on TCP/IP port $PORT1..." +#valgrind -v --gdb-attach=yes --logfile=info --num-callers=16 --leak-check=yes --leak-resolution=high $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING $LOG1 2>&1 & $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & PID=$! if test $WAIT != 0 ; then @@ -44,6 +45,8 @@ KILLPIDS="$PID" echo "Testing certificate handling..." +sleep 1 + for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ 'objectclass=*' > /dev/null 2>&1 diff --git a/tests/scripts/test022-ppolicy b/tests/scripts/test022-ppolicy index 2b3a6143ac..75682d6edd 100755 --- a/tests/scripts/test022-ppolicy +++ b/tests/scripts/test022-ppolicy @@ -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 \ diff --git a/tests/scripts/test023-refint b/tests/scripts/test023-refint index fb1687cff5..0abd2d32c2 100755 --- a/tests/scripts/test023-refint +++ b/tests/scripts/test023-refint @@ -46,6 +46,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd referential integrity operations..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test024-unique b/tests/scripts/test024-unique index 9f2db4aa8e..d14d6222bb 100755 --- a/tests/scripts/test024-unique +++ b/tests/scripts/test024-unique @@ -41,6 +41,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd attribute uniqueness operations..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test025-limits b/tests/scripts/test025-limits index 78d92ea0c7..4280532389 100755 --- a/tests/scripts/test025-limits +++ b/tests/scripts/test025-limits @@ -47,6 +47,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd searching..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test026-dn b/tests/scripts/test026-dn index 01417a0f96..1b5c9ac967 100755 --- a/tests/scripts/test026-dn +++ b/tests/scripts/test026-dn @@ -27,6 +27,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd DN parsing..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test027-emptydn b/tests/scripts/test027-emptydn index efb922ae50..aadbe85553 100755 --- a/tests/scripts/test027-emptydn +++ b/tests/scripts/test027-emptydn @@ -44,6 +44,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd empty DN handling..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ @@ -104,6 +106,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd empty DN handling..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test028-idassert b/tests/scripts/test028-idassert index ea364bc8d4..716a3442ab 100755 --- a/tests/scripts/test028-idassert +++ b/tests/scripts/test028-idassert @@ -74,6 +74,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +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 \ diff --git a/tests/scripts/test029-ldapglue b/tests/scripts/test029-ldapglue index 4701e1897e..5d194c0d12 100755 --- a/tests/scripts/test029-ldapglue +++ b/tests/scripts/test029-ldapglue @@ -97,6 +97,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID1 $PID2 $PID3" +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 \ diff --git a/tests/scripts/test031-component-filter b/tests/scripts/test031-component-filter index cda58d406a..69466f2043 100755 --- a/tests/scripts/test031-component-filter +++ b/tests/scripts/test031-component-filter @@ -60,6 +60,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd searching..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test032-chain b/tests/scripts/test032-chain index b0c6435d79..5b6a1db01b 100755 --- a/tests/scripts/test032-chain +++ b/tests/scripts/test032-chain @@ -62,6 +62,8 @@ fi KILLPIDS="$PID1 $PID2" +sleep 1 + echo "Using ldapsearch to check that first slapd is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test033-glue-syncrepl b/tests/scripts/test033-glue-syncrepl index 1ffb611d6b..57d50b8477 100755 --- a/tests/scripts/test033-glue-syncrepl +++ b/tests/scripts/test033-glue-syncrepl @@ -40,6 +40,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Using ldapsearch to check that slapd 1 is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ @@ -62,6 +64,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $PID" +sleep 1 + echo "Using ldapsearch to check that slapd 2 is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \ diff --git a/tests/scripts/test034-translucent b/tests/scripts/test034-translucent index b42f104133..e30ba63dde 100755 --- a/tests/scripts/test034-translucent +++ b/tests/scripts/test034-translucent @@ -57,6 +57,8 @@ fi REMOTEPID="$PID" KILLPIDS="$PID" +sleep 1 + for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -H $URI1 \ 'objectclass=*' > /dev/null 2>&1 @@ -89,6 +91,8 @@ fi LOCALPID="$PID" KILLPIDS="$LOCALPID $REMOTEPID" +sleep 1 + for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -H $URI2 \ 'objectclass=*' > /dev/null 2>&1 @@ -215,6 +219,8 @@ fi LOCALPID="$PID" KILLPIDS="$REMOTEPID $PID" +sleep 1 + for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -H $URI2 \ 'objectclass=*' > /dev/null 2>&1 @@ -635,6 +641,8 @@ fi LOCALPID="$PID" KILLPIDS="$REMOTEPID $PID" +sleep 1 + for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -H $URI2 \ 'objectclass=*' > /dev/null 2>&1 diff --git a/tests/scripts/test035-meta b/tests/scripts/test035-meta index d9164f1279..c88b19de5b 100755 --- a/tests/scripts/test035-meta +++ b/tests/scripts/test035-meta @@ -37,6 +37,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +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 \ @@ -74,6 +76,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $PID" +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 $PORT2 \ @@ -111,6 +115,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $PID" +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 $PORT3 \ diff --git a/tests/scripts/test036-meta-concurrency b/tests/scripts/test036-meta-concurrency index c1d81cddfd..1aeaa205a3 100755 --- a/tests/scripts/test036-meta-concurrency +++ b/tests/scripts/test036-meta-concurrency @@ -65,6 +65,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +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 \ @@ -102,6 +104,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $PID" +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 $PORT2 \ @@ -139,6 +143,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $PID" +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 $PORT3 \ diff --git a/tests/scripts/test037-manage b/tests/scripts/test037-manage index f28ec6ff0f..e6823425a8 100755 --- a/tests/scripts/test037-manage +++ b/tests/scripts/test037-manage @@ -36,6 +36,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd Manage operations..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test038-retcode b/tests/scripts/test038-retcode index 9a626383ab..3437b7efc9 100755 --- a/tests/scripts/test038-retcode +++ b/tests/scripts/test038-retcode @@ -50,6 +50,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd searching..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test039-glue-ldap-concurrency b/tests/scripts/test039-glue-ldap-concurrency index 87cabe33d8..2617e780c9 100755 --- a/tests/scripts/test039-glue-ldap-concurrency +++ b/tests/scripts/test039-glue-ldap-concurrency @@ -42,6 +42,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +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 \ @@ -79,6 +81,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $PID" +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 $PORT2 \ @@ -116,6 +120,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $PID" +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 $PORT3 \ diff --git a/tests/scripts/test040-subtree-rename b/tests/scripts/test040-subtree-rename index f212a5c03d..62ece0de90 100755 --- a/tests/scripts/test040-subtree-rename +++ b/tests/scripts/test040-subtree-rename @@ -36,6 +36,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd searching..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test041-aci b/tests/scripts/test041-aci index b38457de3c..0ba871e78c 100755 --- a/tests/scripts/test041-aci +++ b/tests/scripts/test041-aci @@ -50,6 +50,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd ACI access control..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ diff --git a/tests/scripts/test042-valsort b/tests/scripts/test042-valsort index fd86e31b35..b8a332f753 100755 --- a/tests/scripts/test042-valsort +++ b/tests/scripts/test042-valsort @@ -41,6 +41,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Testing slapd sorted values operations..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \