diff --git a/tests/p_arpwatch/arpwatch_test.sh b/tests/p_arpwatch/arpwatch_test.sh index a8a66a0..3a7eebf 100755 --- a/tests/p_arpwatch/arpwatch_test.sh +++ b/tests/p_arpwatch/arpwatch_test.sh @@ -18,23 +18,17 @@ else fi # beginning and running test -if [ $centos_ver == '6' ] - then - t_Log "Skipping for the time being on C6 until fixed" - ret_val=0 -else - arpwatch - sleep 4 - arp -d $defgw - sleep 2 - ping -q -i 0.5 -c 5 $defgw - killall arpwatch - sleep 2 - grep -q $defgw $arpdat - ret_val=$? -fi +arpwatch +sleep 4 +arp -d $defgw +sleep 2 +ping -q -i 0.5 -c 5 $defgw +killall arpwatch +sleep 2 +grep -q $defgw $arpdat + +t_CheckExitStatus $? # cleaning up cat /dev/null > $arpdat -t_CheckExitStatus $ret_val diff --git a/tests/p_lftp/10_lftp_http_test.sh b/tests/p_lftp/10_lftp_http_test.sh index 43b5158..b3d10aa 100755 --- a/tests/p_lftp/10_lftp_http_test.sh +++ b/tests/p_lftp/10_lftp_http_test.sh @@ -3,24 +3,27 @@ # Author: Munish Kumar # Author: Ayush Gupta # Author: Konark Modi +# Christoph Galuschka t_Log "Running $0 - lftp: HTTP test" if [ $SKIP_QA_HARNESS ]; then -CHECK_FOR="UTC" -URL="http://mirror.centos.org/centos/timestamp.txt" + CHECK_FOR="UTC" + URL="http://mirror.centos.org/" + FILE="timestamp.txt" else -CHECK_FOR="UTC" -URL="http://mirror.centos.org/centos/timestamp.txt" + CHECK_FOR="CentOS" + URL="http://repo.centos.qa/CentOS/6/os/x86_64/" + FILE="RELEASE-NOTES-en-US.html" fi -t_Log "Querying ${URL}" +t_Log "Querying ${URL}${FILE}" -lftp << EOF -pget -n 5 ${URL} +lftp <