+ bc64577

Author: sobomax

tests/functions

@@ -31,6 +31,7 @@ MAKEANN_PROD=${TOP_BUILDDIR}/makeann/makeann
 EXTRACTAUDIO=${TOP_BUILDDIR}/extractaudio/extractaudio_debug
 REVTEMPL="${PYINT} ${TOP_BUILDDIR}/scripts/revtempl.py"
 KILL_CMD="`which kill`"
+ROOT_KILL_CMD="${SUDO} ${KILL_CMD}"
 MKTEMP_CMD="`which mktemp`"
 RTPPROXY="${RTPPROXY:-${RTPPROXY_DBG}}"
 MAKEANN="${MAKEANN:-${MAKEANN_PROD}}"
@@ -39,14 +40,12 @@ MYUID=`id -u`
 
 if [ ${MYUID} -eq 0 ]
 then
-  set -x
   for v in RTPPROXY_DBG RTPPROXY_PROD RTPP_QUERY RTPP_NOTYFY_CLIENT \
    RPTL_INT MAKEANN_DBG MAKEANN_PROD EXTRACTAUDIO REVTEMPL MKTEMP_CMD \
-   RTPPROXY MAKEANN
+   RTPPROXY MAKEANN KILL_CMD
   do
     eval "${v}=\"sudo -n -u nobody \${${v}}\""
   done
-  set +x
 fi
 
 setup_tstart() {
@@ -224,8 +223,8 @@ fi
 SED="sed ${SED_ARGS}"
 
 rtpproxy_start() {
-  set -x
-  local IFS=
+  local IFS=' 
+'
   tempfoo="`basename $0`.XXXXX"
   TMP_PIDFILE=`${MKTEMP_CMD} -t ${tempfoo}` || return 1
   TMP_SOCKFILE=${RTPP_SOCKFILE:-`${MKTEMP_CMD} -t ${tempfoo}`} || return 1
@@ -240,7 +239,6 @@ rtpproxy_start() {
      2>${TMP_LOGFILE}
   fi
   RC=${?}
-  set +x
   if [ ${RC} -ne 0 ]
   then
     if [ -s "${TMP_LOGFILE}" ]
@@ -336,6 +334,7 @@ witness_start() {
 }
 
 notify_client_stop() {
+  set -x
   local NC_PID="${1}"
   ${KILL_CMD} ${NC_PID} 2>/dev/null
   report "asking NOTYFY_CLIENT[${NC_PID}] to exit"
@@ -351,12 +350,13 @@ notify_client_stop() {
     break
   done
   report_rc ${not_exited} "waiting for NOTYFY_CLIENT[${NC_PID}] to exit"
+  set +x
 }
 
 witness_stop() {
   if [ "${WITNESS_PID}" != "" ]
   then
-    ${SUDO} ${KILL_CMD} -TERM ${WITNESS_PID} 2>/dev/null
+    ${ROOT_KILL_CMD} -TERM ${WITNESS_PID} 2>/dev/null
     if [ "${WITNESS_ADD_FILES}" != "" ]
     then
       WITNESS_NAME="${TESTNAME}.${TEST_TIMESTAMP}.debug.tbz2"

tests/startstop/badargs

@@ -22,11 +22,11 @@ do_run()
 {
   for bad_rargs in ${1}
   do
-    IFS=\&
+    local IFS=\&
     set -o noglob
     RTPP_ARGS=`eval "echo \"${bad_rargs}\""`
     rtpproxy_start ${RTPP_ARGS}
-    reportifnotfail "`basename ${RTPPROXY}` don't start with bad argumens: \""${RTPP_ARGS}"\""
+    reportifnotfail "${RTPPROXY}: don't start with bad argumens: \""${RTPP_ARGS}"\""
     cat "${TMP_LOGFILE}" >> "${TS_LOGFILE}"
     rm "${TMP_LOGFILE}"
   done
@@ -46,5 +46,5 @@ do
   do_run "${bad_rargs_all}" &
   DR_PID=${!}
   wait ${DR_PID}
-  report "checks for `basename ${RTPPROXY}`"
+  report "checks for: ${RTPPROXY}"
 done

tests/startstop/badargs.common.input

@@ -64,8 +64,8 @@
 -u&:nogroup
 -u&nahh:${mygid}
 -u&nahh:dooh
--u&nobody
--u&nobody:nogroup
+-u&games
+-u&games:nogroup
 -u&root:${mygid}
 -v
 -w&&

tests/startstop/startstop.sub

@@ -49,13 +49,13 @@ test_startstop() {
       rm -f rtpproxy_acct.csv
       echo "rtpproxy_start ${rargs} ${SOCK_RARGS}" >&2
       rtpproxy_start ${rargs} ${SOCK_RARGS}
-      report "`basename ${RTPPROXY}` start"
+      report "${RTPPROXY}: start"
       rtpproxy_stop ${sig}
-      report "`basename ${RTPPROXY}` stop (SIG${sig})"
+      report "${RTPPROXY}: stop (SIG${sig})"
       cat "${TMP_LOGFILE}" >> "${TS_LOGFILE}"
       rm "${TMP_LOGFILE}"
       ${DIFF} "startstop/${REF_OUTFILE}" "${RTPP_OUTFILE}"
-      report "`basename ${RTPPROXY}` output"
+      report "${RTPPROXY}: output"
     done
   done
 }