From 722da5fb3ceb7a84584d8932e36786ee1ae34163 Mon Sep 17 00:00:00 2001 From: Christoph Galuschka Date: Nov 09 2012 16:12:11 +0000 Subject: added missing commit --- diff --git a/tests/p_iputils/tracepath_test.sh b/tests/p_iputils/tracepath_test.sh index 2313662..3df9b3f 100755 --- a/tests/p_iputils/tracepath_test.sh +++ b/tests/p_iputils/tracepath_test.sh @@ -2,7 +2,7 @@ # Author: Christoph Galuschka TEST=tracepath -t_Log "Running $0 - running "${TEST}" to webhost" +t_Log "Running $0 - running ${TEST} to webhost" # Testing availability of network if [ $SKIP_QA_HARNESS -eq 1 ]; then diff --git a/tests/p_mtr/mtr_test.sh b/tests/p_mtr/mtr_test.sh index d335449..8624128 100755 --- a/tests/p_mtr/mtr_test.sh +++ b/tests/p_mtr/mtr_test.sh @@ -2,7 +2,7 @@ # Author: Christoph Galuschka TEST=mtr -t_Log "Running $0 - running "${TEST}" to webhost" +t_Log "Running $0 - running ${TEST} to webhost" # Testing availability of network if [ $SKIP_QA_HARNESS -eq 1 ]; then diff --git a/tests/p_traceroute/traceroute_test.sh b/tests/p_traceroute/traceroute_test.sh index 656b639..217e3bf 100755 --- a/tests/p_traceroute/traceroute_test.sh +++ b/tests/p_traceroute/traceroute_test.sh @@ -1,7 +1,8 @@ #!/bin/sh # Author: Christoph Galuschka -t_Log "Running $0 - running traceroute to webhost" +TEST=traceroute +t_Log "Running $0 - running ${TEST} to webhost" # Testing availability of network if [ $SKIP_QA_HARNESS -eq 1 ]; then @@ -23,10 +24,10 @@ then COUNT=$( traceroute -n ${HOST} | grep -c ${BASH_REMATCH[1]} ) if [ $COUNT = 2 ] then - t_Log "traceroute reached ${HOST} and nslookup seems to work, too" + t_Log "${TEST} reached ${HOST}" ret_val=0 else - t_Log "traceroute didn't reach ${HOST}" + t_Log "${TEST} didn't reach ${HOST}" ret_val=1 fi fi @@ -35,5 +36,4 @@ else ret_val=0 fi -echo $ret_val -#t_CheckExitStatus $ret_val +t_CheckExitStatus $ret_val