ps is not good enough to use for testing

diff --git a/src/arm/test_gnunet_arm.sh b/src/arm/test_gnunet_arm.sh
index c7028729b2e808a6513d2216e2cc9fefa5ed618f..00c31a57376ff10b1d378dbac490fdee8b217b1a 100755 (executable)
--- a/src/arm/test_gnunet_arm.sh
+++ b/src/arm/test_gnunet_arm.sh
@@ -6,20 +6,6 @@ base=/tmp/gnunet-test-arm
 out=/tmp/test-gnunetd-arm.log
 #DEBUG="-L DEBUG"
 
-# -------------------------------------------
-echo -n "TEST: can this script work?... "
-LINES=`ps -C gnunet-service-arm -o pid= | wc -l`
-if test $LINES -ne 0; then
-  echo "No (arm exists). Exiting early."
-  exit 0
-fi
-LINES=`ps -C gnunet-service-resolver -o pid= | wc -l`
-if test $LINES -ne 0; then
-  echo "No (resolver exists). Exiting early."
-  exit 0
-fi
-echo "Yes."
-
 
 # ----------------------------------------------------------------------------------
 echo -n "TEST: Bad argument checking... "
@@ -39,13 +25,6 @@ if ! $exe $DEBUG -s > $out ; then
   cat $out
   exit 1
 fi
-LINES=`ps -u $USER -C gnunet-service-arm -o pid= | wc -l`
-if test $LINES -eq 0; then
-  echo "FAIL: found $LINES gnunet-service-arm processes"
-  echo "Command output was:"
-  cat $out
-  exit 1
-fi
 echo "PASS"
 sleep 1
 
@@ -60,19 +39,10 @@ if ! $exe $DEBUG -i resolver > $out ; then
   exit 1
 fi
 sleep 1
-LINES=`ps -C gnunet-service-resolver -o pid= | wc -l`
-if test $LINES -ne 1; then
-  echo "FAIL: unexpected output (got $LINES lines, wanted 1)"
-  echo "Command output was:"
-  cat $out
-  $exe -e > /dev/null
-  exit 1
-fi
 echo "PASS"
 
 # ----------------------------------------------------------------------------------
 echo -n "TEST: Test -t on running service... "
-
 if ! $exe $DEBUG -t resolver > $base.out; then
     echo "FAIL: error running $exe"
     exit 1
@@ -102,25 +72,10 @@ if ! $exe $DEBUG -k resolver > $out; then
   exit 1
 fi
 sleep 1
-LINES=`ps -C gnunet-service-resolver -o pid= | wc -l`
-if test $LINES -ne 0; then
-  sleep 5
-  LINES=`ps -C gnunet-service-resolver -o pid= | wc -l`
-fi
-if test $LINES -ne 0; then
-  sleep 2
-
-  echo "FAIL: unexpected output"
-  echo "Command output was:"
-  cat $out
-  $exe -e > /dev/null
-  exit 1
-fi
 echo "PASS"
 
 # ----------------------------------------------------------------------------------
 echo -n "TEST: Test -t on stopped service... "
-
 if ! $exe $DEBUG -t resolver > $base.out; then
   echo "FAIL: error running $exe"
   cat $base.out
@@ -144,17 +99,6 @@ if ! $exe $DEBUG -e > $out; then
   exit 1
 fi
 sleep 1
-LINES=`ps -C gnunet-service-arm -o pid= | wc -l`
-if test $LINES -ne 0; then
-  sleep 5
-  LINES=`ps -C gnunet-service-arm -o pid= | wc -l`
-fi
-if test $LINES -ne 0; then
-  echo "FAIL: unexpected output, still have $LINES gnunet-service-arm processes"
-  echo "Command output was:"
-  cat $out  
-  exit 1
-fi
 echo "PASS"
 
 rm -rf /tmp/test-gnunetd-arm/