[incubator-trafficcontrol] 15/15: Small tweaks

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rob pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit 1ef7a581b4b505b19ee8907eb079ed5856e0e083
Author: Jan van Doorn <jv...@knutsel.com>
AuthorDate: Tue May 29 10:26:46 2018 -0600

    Small tweaks
---
 grove/integration_test/setup-and-run.sh                     | 12 ++++++++----
 grove/integration_test/tests/plugins/modify_headers/test.sh |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/grove/integration_test/setup-and-run.sh b/grove/integration_test/setup-and-run.sh
index 3194947..f16612f 100644
--- a/grove/integration_test/setup-and-run.sh
+++ b/grove/integration_test/setup-and-run.sh
@@ -75,9 +75,10 @@ go build compare_gets.go
 
 
 function run_test () {
-  "$@"
+  "$@" > /tmp/run_test.out 2>&1
   thisresult=$?
 
+   echo -n "Test ${testno} ($@): "
   result=$(($result+thisresult))
   if [ $thisresult -eq 0 ]
   then
@@ -90,9 +91,12 @@ function run_test () {
 }
 export -f run_test
 
+cp  $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/integration_test/tests/plugins/modify_headers/remap.json /remap.json
+pkill -HUP grove
+bash $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/integration_test/tests/plugins/modify_headers/test.sh
 
-$GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/integration_test/tests/plugins/modify_headers/test.sh
-
-$GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/integration_test/tests/plugins/range_req_handler/test.sh
+cp $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/integration_test/tests/plugins/range_req_handler/remap.json /remap.json
+pkill -HUP grove
+bash $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/integration_test/tests/plugins/range_req_handler/test.sh
 
 
diff --git a/grove/integration_test/tests/plugins/modify_headers/test.sh b/grove/integration_test/tests/plugins/modify_headers/test.sh
index 9e9615d..0e507fe 100644
--- a/grove/integration_test/tests/plugins/modify_headers/test.sh
+++ b/grove/integration_test/tests/plugins/modify_headers/test.sh
@@ -34,7 +34,7 @@ run_test grep "< Server: Grove/0.39999999"  /tmp/hdrs.out
 run_test curl -XTRACE -H'Host: disk-test.cdn.kabletown.net' http://localhost:8080/10Mb.txt -Lkvs -o /tmp/out
 cp /tmp/run_test.out /tmp/hdrs.out
 run_test grep "X-From-Cdn: Traffic-Control" /tmp/out
-run_test grep "< X-Cdn-Name: GroverCDN" /tmp/out
+run_test grep "< X-Cdn-Name: GroverCDN" /tmp/hdrs.out
 
 echo "plugin/modify_headers: $testno tests done, $result failed."
 

-- 
To stop receiving notification emails like this one, please contact
rob@apache.org.