Fix some messaging so it's clearer what is happening during the test

smokeinfra/run.sh

@@ -45,7 +45,7 @@ sleep 120
 jobs -p > results/serverpids
 
 finish() {
-    echo "KILLED! STOPPING SERVERS AND GATEWAYS..."
+    echo "STOPPING SERVERS AND GATEWAYS..."
     # NOTE: jobs -p doesn't work in a signal handler
     for job in $(cat results/serverpids)
     do
@@ -59,13 +59,6 @@ trap finish INT
 
 sleep 15
 
-echo "STOPPING SERVERS AND GATEWAYS..."
-# NOTE: jobs -p doesn't work in a signal handler
-for job in $(cat results/serverpids)
-do
-    echo "Stopping $job"
-    kill $job
-done
 
 echo "CHECKING OUTPUT FOR ERRORS"
 set +x
@@ -87,6 +80,5 @@ if [ ! -s rid.txt ]; then
     exit 42
 fi
 
-echo "SUCCESS!"
-
 tail $SERVERLOGS/*.console
+echo "SUCCESS!"