From acecddc2dc31f3a1c0ec8efe02c1667bcaeff368 Mon Sep 17 00:00:00 2001 From: Athmane Madjoudj Date: Apr 20 2012 19:28:59 +0000 Subject: Merge branch 'master' of gitorious.org:testautomation/t_functional --- diff --git a/tests/p_curl/curl_test.sh b/tests/p_curl/curl_test.sh index 1ed1d1c..84e8dab 100755 --- a/tests/p_curl/curl_test.sh +++ b/tests/p_curl/curl_test.sh @@ -4,11 +4,12 @@ t_Log "Running $0 - curl can access http-host and retrieve index.html." -CHECK_FOR="CentOS Wiki" if [ $SKIP_QA_HARNESS ]; then + CHECK_FOR="CentOS Wiki" URL="http://wiki.centos.org/" else + CHECK_FOR="Index of /srv" URL="http://repo.centos.qa/srv/CentOS/" fi diff --git a/tests/p_wget/wget_test.sh b/tests/p_wget/wget_test.sh index 7456743..3e0a24f 100755 --- a/tests/p_wget/wget_test.sh +++ b/tests/p_wget/wget_test.sh @@ -5,11 +5,12 @@ t_Log "Running $0 - wget can access http-host and download index.html." FILE=/var/tmp/index.html -CHECK_FOR="CentOS" if [ $SKIP_QA_HARNESS ]; then + CHECK_FOR="CentOS" URL="http://wiki.centos.org/" else + CHECK_FOR="CentOS" URL="http://repo.centos.qa/srv/CentOS/" fi