diff --git a/tests/0_lib/functions.sh b/tests/0_lib/functions.sh index 93e159e..3e10393 100755 --- a/tests/0_lib/functions.sh +++ b/tests/0_lib/functions.sh @@ -135,3 +135,4 @@ export -f t_DistCheck export -f t_GetPkgVer export -f t_GetArch export -f t_Assert +export centos_ver diff --git a/tests/p_httpd/httpd_vhost.sh b/tests/p_httpd/httpd_vhost.sh index 8a54df6..4290f5e 100755 --- a/tests/p_httpd/httpd_vhost.sh +++ b/tests/p_httpd/httpd_vhost.sh @@ -16,10 +16,13 @@ EOF mkdir -p /var/www/vhosts/test/ echo "Virtual Host Test Page" > /var/www/vhosts/test/index.html -t_ServiceControl httpd cycle +t_ServiceControl httpd stop +killall httpd +t_ServiceControl httpd start + curl -s http://test/ | grep 'Virtual Host Test Page' > /dev/null 2>&1 -#t_CheckExitStatus $? +t_CheckExitStatus $? # SteveCB: remove vhost-test.conf to prevent later tests # that assume DocumentRoot is /var/www/html from failing