Use --detach in tests to avoid waiting

2016-12-04 16:42:33 -06:00
parent 8735d47d8b
commit 2027aa11ed
26 changed files with 95 additions and 205 deletions
--- a/tests/kdc/check-canon.in
+++ b/tests/kdc/check-canon.in
@@ -99,14 +99,8 @@ ${kadmin} check ${R3} || exit 1
 echo foo > ${objdir}/foopassword

 echo "Starting kdc" ; > messages.log
-${kdc} &
-kdcpid=$!
-
-sh ${wait_kdc}
-if [ "$?" != 0 ] ; then
-    kill -9 ${kdcpid}
-    exit 1
-fi
+${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
+kdcpid=`getpid kdc`

 trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

--- a/tests/kdc/check-cc.in
+++ b/tests/kdc/check-cc.in
@@ -88,14 +88,8 @@ ${kadmin} check ${R} || exit 1
 echo foo > ${objdir}/foopassword

 echo Starting kdc ; > messages.log
-${kdc} &
-kdcpid=$!
-
-sh ${wait_kdc}
-if [ "$?" != 0 ] ; then
-    kill -9 ${kdcpid}
-    exit 1
-fi
+${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
+kdcpid=`getpid kdc`

 trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

--- a/tests/kdc/check-delegation.in
+++ b/tests/kdc/check-delegation.in
@@ -102,14 +102,8 @@ ${kadmin} check ${R4} || exit 1
 echo foo > ${objdir}/foopassword

 echo Starting kdc; > messages.log
-${kdc} &
-kdcpid=$!
-
-sh ${wait_kdc}
-if [ "$?" != 0 ] ; then
-    kill -9 ${kdcpid}
-    exit 1
-fi
+${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
+kdcpid=`getpid kdc`

 trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

--- a/tests/kdc/check-des.in
+++ b/tests/kdc/check-des.in
@@ -96,14 +96,8 @@ ${kadmin} check ${R} || exit 1
 echo foo > ${objdir}/foopassword

 echo Starting kdc; > messages.log
-${kdc} &
-kdcpid=$!
-
-sh ${wait_kdc}
-if [ "$?" != 0 ] ; then
-    kill -9 ${kdcpid}
-    exit 1
-fi
+${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
+kdcpid=`getpid kdc`

 trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

--- a/tests/kdc/check-digest.in
+++ b/tests/kdc/check-digest.in
@@ -94,14 +94,9 @@ ${kadmin} check ${R} || exit 1
 echo $password > ${objdir}/foopassword

 echo "Starting kdc" ; > messages.log
-env ${HEIM_MALLOC_DEBUG} ${kdc} &
-kdcpid=$!
-
-sh ${wait_kdc}
-if [ "$?" != 0 ] ; then
-    kill -9 ${kdcpid}
-    exit 1
-fi
+env ${HEIM_MALLOC_DEBUG} ${kdc} --detach --testing ||
+    { echo "kdc failed to start"; exit 1; }
+kdcpid=`getpid kdc`

 trap "kill -9 ${kdcpid}; echo signal killing kdc; cat messages.log; exit 1;" EXIT

--- a/tests/kdc/check-fast.in
+++ b/tests/kdc/check-fast.in
@@ -88,14 +88,8 @@ echo bar > ${objdir}/barpassword

 echo Starting kdc ; > messages.log
 env MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log \
-${kdc} &
-kdcpid=$!
-
-sh ${wait_kdc}
-if [ "$?" != 0 ] ; then
-    kill -9 ${kdcpid}
-    exit 1
-fi
+${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
+kdcpid=`getpid kdc`

 trap "kill -9 ${kdcpid}; echo signal killing kdc; cat messages.log; exit 1;" EXIT

--- a/tests/kdc/check-hdb-mitdb.in
+++ b/tests/kdc/check-hdb-mitdb.in
@@ -85,14 +85,8 @@ echo foo > ${objdir}/foopassword

 echo Starting kdc ; > messages.log
 env MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log \
-${kdc} &
-kdcpid=$!
-
-sh ${wait_kdc}
-if [ "$?" != 0 ] ; then
-    kill -9 ${kdcpid}
-    exit 1
-fi
+${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
+kdcpid=`getpid kdc`

 trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

--- a/tests/kdc/check-iprop.in
+++ b/tests/kdc/check-iprop.in
@@ -128,23 +128,22 @@ ipropd_slave="${ipropd_slave} --status-file=iprop-slave-status"
 trap "echo 'killing ipropd s + m + kdc'; kill -9 \${ipdm} \${ipds} \${kdcpid} >/dev/null 2>/dev/null; tail messages.log ; tail iprop-stats; exit 1;" EXIT

 echo Starting kdc ; > messages.log
-${kdc} &
-kdcpid=$!
-
-sh ${wait_kdc} || exit 1
+${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
+kdcpid=`getpid kdc`

 echo "starting master" ; > messages.log
 env ${HEIM_MALLOC_DEBUG} \
 ${ipropd_master} --hostname=localhost -k ${keytab} \
-    --database=${objdir}/current-db &
-ipdm=$!
-sh ${wait_kdc} ipropd-master || exit 1
+    --database=${objdir}/current-db --detach ||
+    { echo "ipropd-master failed to start"; exit 1; }
+ipdm=`getpid ipropd-master`

 echo "starting slave" ; > messages.log
 env ${HEIM_MALLOC_DEBUG} \
 KRB5_CONFIG="${objdir}/krb5-slave.conf" \
-${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
-ipds=$!
+${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} --detach localhost ||
+    { echo "ipropd-slave failed to start"; exit 1; }
+ipds=`getpid ipropd-slave`
 sh ${wait_kdc} ipropd-slave messages.log 'slave status change: up-to-date' || exit 1
 sleep 1

@@ -213,6 +212,7 @@ echo "kill slave and remove log and database"
 sh ${leaks_kill} ipropd-slave $ipds || exit 1
 rm -f iprop-slave-status

+sleep 2
 ${EGREP} 'iprop/slave.test.h5l.se@TEST.H5L.SE.*Down' iprop-stats >/dev/null || exit 1

 # ----------------- checking: slave is missing changes while down
@@ -232,8 +232,9 @@ echo "starting slave again" ; > messages.log
 > iprop-stats
 env ${HEIM_MALLOC_DEBUG} \
 KRB5_CONFIG="${objdir}/krb5-slave.conf" \
-${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
-ipds=$!
+${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} --detach localhost ||
+    { echo "ipropd-slave failed to start"; exit 1; }
+ipds=`getpid ipropd-slave`
 sh ${wait_kdc} ipropd-slave messages.log 'slave status change: up-to-date' || exit 1
 sleep 1

@@ -259,8 +260,9 @@ rm -f iprop-slave-status
 echo "starting slave" ; > messages.log
 env ${HEIM_MALLOC_DEBUG} \
 KRB5_CONFIG="${objdir}/krb5-slave.conf" \
-${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
-ipds=$!
+${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} --detach localhost ||
+    { echo "ipropd-slave failed to start"; exit 1; }
+ipds=`getpid ipropd-slave`
 sh ${wait_kdc} ipropd-slave messages.log 'slave status change: up-to-date' || exit 1
 sleep 1

@@ -304,15 +306,16 @@ cp ${objdir}/current.log.tmp ${objdir}/current.log
 echo "starting master"  ; > messages.log
 env ${HEIM_MALLOC_DEBUG} \
 ${ipropd_master} --hostname=localhost -k ${keytab} \
-    --database=${objdir}/current-db &
-ipdm=$!
-sh ${wait_kdc} ipropd-master || exit 1
+    --database=${objdir}/current-db --detach ||
+    { echo "ipropd-master failed to start"; exit 1; }
+ipdm=`getpid ipropd-master`

 echo "starting slave" ; > messages.log
 env ${HEIM_MALLOC_DEBUG} \
 KRB5_CONFIG="${objdir}/krb5-slave.conf" \
-${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
-ipds=$!
+${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} --detach localhost ||
+    { echo "ipropd-slave failed to start"; exit 1; }
+ipds=`getpid ipropd-slave`
 sh ${wait_kdc} ipropd-slave messages.log 'slave status change: up-to-date' || exit 1
 sleep 1

@@ -346,9 +349,9 @@ kill -0 ${ipds}  || { echo "slave no longer there"; exit 1; }
 echo "Staring master again" ; > messages.log
 env ${HEIM_MALLOC_DEBUG} \
 ${ipropd_master} --hostname=localhost -k ${keytab} \
-    --database=${objdir}/current-db &
-ipdm=$!
-sh ${wait_kdc} ipropd-master || exit 1
+    --database=${objdir}/current-db --detach ||
+    { echo "ipropd-master failed to start"; exit 1; }
+ipdm=`getpid ipropd-master`

 echo "probing for slave pid"
 kill -0 ${ipds}  || { echo "slave no longer there"; exit 1; }
--- a/tests/kdc/check-kadmin.in
+++ b/tests/kdc/check-kadmin.in
@@ -89,15 +89,8 @@ ${kadmin} -l modify --pkinit-acl="CN=baz,DC=test,DC=h5l,DC=se" pkinit@${R} || ex
 echo foo > ${objdir}/foopassword

 echo Starting kdc ; > messages.log
-${kdc} &
-kdcpid=$!
-
-sh ${wait_kdc}
-if [ "$?" != 0 ] ; then
-    kill -9 ${kdcpid}
-    kill -9 ${kadmpid}
-    exit 1
-fi
+${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
+kdcpid=`getpid kdc`

 trap "kill -9 ${kdcpid} ${kadmpid}" EXIT

--- a/tests/kdc/check-kdc.in
+++ b/tests/kdc/check-kdc.in
@@ -332,18 +332,14 @@ echo notfoo > ${objdir}/notfoopassword

 echo Starting kdc ; > messages.log
 env MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log \
-${kdc} &
-kdcpid=$!
-
-sh ${wait_kdc}
-if [ "$?" != 0 ] ; then
-    kill -9 ${kdcpid}
-    exit 1
-fi
+${kdc} --detach --testing ||
+    { echo "kdc failed to start"; exit 1; }
+kdcpid=`getpid kdc`

 echo Starting kpasswdd; > messages.log
-env ${HEIM_MALLOC_DEBUG} ${kpasswdd} &
-kpasswddpid=$!
+env ${HEIM_MALLOC_DEBUG} ${kpasswdd} --detach ||
+    { echo "kpasswdd failed to start"; exit 1; }
+kpasswddpid=`getpid kpasswdd`


 trap "kill -9 ${kdcpid} ${kpasswddpid}; echo signal killing kdc kpasswdd; exit 1;" EXIT
--- a/tests/kdc/check-kinit.in
+++ b/tests/kdc/check-kinit.in
@@ -107,14 +107,8 @@ if (($# == 0)); then
    echo foo > ${objdir}/foopassword

    echo Starting kdc ; > messages.log
-    ${kdc} &
-    kdcpid=$!
-
-    sh ${wait_kdc}
-    if [ "$?" != 0 ] ; then
-	kill -9 ${kdcpid}
-	exit 1
-    fi
+    ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
+    kdcpid=`getpid kdc`

    trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

--- a/tests/kdc/check-kpasswdd.in
+++ b/tests/kdc/check-kpasswdd.in
@@ -102,18 +102,14 @@ ${kadmin} check ${R2} || exit 1
 echo foo > ${objdir}/foopassword

 echo Starting kdc ; > messages.log
-env ${HEIM_MALLOC_DEBUG} ${kdc} &
-kdcpid=$!
-
-sh ${wait_kdc}
-if [ "$?" != 0 ] ; then
-    kill -9 ${kdcpid}
-    exit 1
-fi
+env ${HEIM_MALLOC_DEBUG} ${kdc} --detach --testing ||
+    { echo "kdc failed to start"; exit 1; }
+kdcpid=`getpid kdc`

 echo Starting kpasswdd
-env ${HEIM_MALLOC_DEBUG} ${kpasswdd} &
-kpasswddpid=$!
+env ${HEIM_MALLOC_DEBUG} ${kpasswdd} --detach ||
+    { echo "kpasswdd failed to start"; exit 1; }
+kpasswddpid=`getpid kpasswdd`

 trap "kill -9 ${kdcpid} ${kpasswddpid}; echo signal killing kdc; exit \$ec;" EXIT

--- a/tests/kdc/check-pkinit.in
+++ b/tests/kdc/check-pkinit.in
@@ -169,14 +169,8 @@ ${hxtool} issue-certificate \
 echo foo > ${objdir}/foopassword

 echo Starting kdc ; > messages.log
-${kdc} &
-kdcpid=$!
-
-sh ${wait_kdc}
-if [ "$?" != 0 ] ; then
-    kill -9 ${kdcpid}
-    exit 1
-fi
+${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
+kdcpid=`getpid kdc`

 trap "kill -9 ${kdcpid}; echo signal killing kdc; cat ca.crt kdc.crt pkinit.crt ;exit 1;" EXIT

--- a/tests/kdc/check-referral.in
+++ b/tests/kdc/check-referral.in
@@ -59,7 +59,6 @@ klist="${klist} -c $cache"
 kgetcred="${kgetcred} -c $cache"
 kdestroy="${kdestroy} -c $cache ${afs_no_unlog}"

-
 KRB5_CONFIG="${objdir}/krb5.conf"
 export KRB5_CONFIG

@@ -101,14 +100,8 @@ ${kadmin} check ${R2} || exit 1
 echo foo > ${objdir}/foopassword

 echo Starting kdc ; > messages.log
-${kdc} &
-kdcpid=$!
-
-sh ${wait_kdc}
-if [ "$?" != 0 ] ; then
-    kill -9 ${kdcpid}
-    exit 1
-fi
+${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
+kdcpid=`getpid kdc`

 trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

--- a/tests/kdc/check-uu.in
+++ b/tests/kdc/check-uu.in
@@ -61,7 +61,6 @@ kdestroy2="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache2 ${afs_no_unlog}"
 uu_server="${TESTS_ENVIRONMENT} ../../appl/test/uu_server"
 uu_client="${TESTS_ENVIRONMENT} ../../appl/test/uu_client"

-
 KRB5_CONFIG="${objdir}/krb5.conf"
 export KRB5_CONFIG

@@ -87,14 +86,8 @@ ${kadmin} check ${R} || exit 1
 echo foo > ${objdir}/foopassword

 echo Starting kdc ; > messages.log
-${kdc} &
-kdcpid=$!
-
-sh ${wait_kdc}
-if [ "$?" != 0 ] ; then
-    kill -9 ${kdcpid}
-    exit 1
-fi
+${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
+kdcpid=`getpid kdc`

 trap "kill -9 ${kdcpid} ${uuspid}; echo signal killing kdc; exit 1;" EXIT