From 165bfca30d860faea256feb28c71890f2e2862ed Mon Sep 17 00:00:00 2001 From: Athmane Madjoudj Date: Aug 08 2013 01:51:39 +0000 Subject: Replace wiki.c.o with ci.dev.c.o in web-related tests so the nightly tests don't fail if the wiki is under load. --- diff --git a/tests/p_curl/curl_test.sh b/tests/p_curl/curl_test.sh index 1ed35d0..27965ba 100755 --- a/tests/p_curl/curl_test.sh +++ b/tests/p_curl/curl_test.sh @@ -6,8 +6,8 @@ t_Log "Running $0 - curl can access http-host and retrieve index.html." if [ $SKIP_QA_HARNESS -eq 1 ]; then - CHECK_FOR="CentOS Wiki" - URL="http://wiki.centos.org/" + CHECK_FOR="CentOS CI test page" + URL="http://ci.dev.centos.org/cstatic/" else CHECK_FOR="Index of /srv" URL="http://repo.centos.qa/srv/CentOS/" diff --git a/tests/p_lynx/lynx_dump_page_test.sh b/tests/p_lynx/lynx_dump_page_test.sh index ddafa67..15a2fc8 100755 --- a/tests/p_lynx/lynx_dump_page_test.sh +++ b/tests/p_lynx/lynx_dump_page_test.sh @@ -4,13 +4,13 @@ t_Log "Running $0 - check that lynx can dump remote page." if [ $SKIP_QA_HARNESS -eq 1 ]; then - HOST=wiki.centos.org - CHECK_FOR="Page templates" + URL="http://ci.dev.centos.org/cstatic/" + CHECK_FOR="CentOS CI test page" else - HOST=repo.centos.qa + URL="http://repo.centos.qa/qa/" CHECK_FOR="ks_cfg" fi -lynx -dump http://${HOST}/qa/ | grep "${CHECK_FOR}" >/dev/null 2>&1 +lynx -dump ${URL} | grep "${CHECK_FOR}" >/dev/null 2>&1 t_CheckExitStatus $? diff --git a/tests/p_squid/squid_test.sh b/tests/p_squid/squid_test.sh index 17bb214..982a49e 100755 --- a/tests/p_squid/squid_test.sh +++ b/tests/p_squid/squid_test.sh @@ -4,13 +4,13 @@ t_Log "Running $0 - Squid test." if [ $SKIP_QA_HARNESS -eq 1 ]; then - HOST=wiki.centos.org - CHECK_FOR="Page templates" + URL="http://ci.dev.centos.org/cstatic/" + CHECK_FOR="CentOS CI test page" else - HOST=repo.centos.qa + URL="http://repo.centos.qa/qa/" CHECK_FOR="ks_cfg" fi -squidclient -T 2 http://${HOST}/qa/ | grep "${CHECK_FOR}" >/dev/null 2>&1 +squidclient -T 2 ${URL} | grep "${CHECK_FOR}" >/dev/null 2>&1 t_CheckExitStatus $? diff --git a/tests/p_wget/wget_test.sh b/tests/p_wget/wget_test.sh index 1806ac0..2298a67 100755 --- a/tests/p_wget/wget_test.sh +++ b/tests/p_wget/wget_test.sh @@ -8,7 +8,7 @@ FILE=/var/tmp/index.html if [ $SKIP_QA_HARNESS -eq 1 ]; then CHECK_FOR="CentOS" - URL="http://wiki.centos.org/" + URL="http://ci.dev.centos.org/cstatic/" else CHECK_FOR="CentOS" URL="http://repo.centos.qa/srv/CentOS/"