From ab79a99d3d7ab272c94a4e759e734ebf6e8a3e1f Mon Sep 17 00:00:00 2001
From: Rick Carback <rick@privategrity.com>
Date: Fri, 7 Feb 2020 21:22:58 +0000
Subject: [PATCH] Fix some messaging so it's clearer what is happening during
the test
---
smokeinfra/run.sh | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/smokeinfra/run.sh b/smokeinfra/run.sh
index c1ec26c..3b6bf6c 100755
--- a/smokeinfra/run.sh
+++ b/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!"
--
GitLab