From a8bfc7e9ed2271d54c13880dc22657387269f3a9 Mon Sep 17 00:00:00 2001
From: Christoph Galuschka <christoph.galuschka@chello.at>
Date: Aug 09 2012 18:32:43 +0000
Subject: changed p_httpd/httpd_basic_auth.sh: give httpd a little more time to reload

changed p_httpd/httpd_vhosts.sh: give httpd a little more time to reload
changed p_httpd/0-install_httpd.sh: give httpd a little more time to reload
changed p_postgresql/1-config-postgresql.sh: temporary fix for issue 5883 on C5

---

diff --git a/tests/p_httpd/0-install_httpd.sh b/tests/p_httpd/0-install_httpd.sh
index b5db22e..33e3d9a 100755
--- a/tests/p_httpd/0-install_httpd.sh
+++ b/tests/p_httpd/0-install_httpd.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 # Author: Athmane Madjoudj <athmanem@gmail.com>
+#	  Christoph Galuschka
 
 # Install tests deps
 t_Log "Running $0 - httpd: installing curl, http, php and mysql"
@@ -8,4 +9,9 @@ t_InstallPackage curl
 
 # HTTPD / PHP 
 t_InstallPackage httpd mod_ssl php php-mysql 
-t_ServiceControl httpd restart
+t_ServiceControl httpd stop
+sleep 3
+killall httpd
+sleep 3
+t_ServiceControl httpd start
+
diff --git a/tests/p_httpd/httpd_basic_auth.sh b/tests/p_httpd/httpd_basic_auth.sh
index 3c4299f..5310b84 100755
--- a/tests/p_httpd/httpd_basic_auth.sh
+++ b/tests/p_httpd/httpd_basic_auth.sh
@@ -16,7 +16,12 @@ EOF
 htpasswd -c -b /etc/httpd/htpasswd test test
 mkdir -p /var/www/html/basic_auth_test
 echo "Basic authentication Test Page" > /var/www/html/basic_auth_test/index.html
-t_ServiceControl httpd cycle
+t_ServiceControl httpd stop
+sleep 3
+killall httpd
+sleep 3
+t_ServiceControl httpd start
+
 curl -s -u test:test http://localhost/basic_auth_test/ | grep 'Basic authentication Test Page' > /dev/null 2>&1
 
 t_CheckExitStatus $?
diff --git a/tests/p_httpd/httpd_vhost.sh b/tests/p_httpd/httpd_vhost.sh
index 4290f5e..317cb14 100755
--- a/tests/p_httpd/httpd_vhost.sh
+++ b/tests/p_httpd/httpd_vhost.sh
@@ -17,7 +17,9 @@ EOF
 mkdir -p /var/www/vhosts/test/
 echo "Virtual Host Test Page" > /var/www/vhosts/test/index.html
 t_ServiceControl httpd stop
+sleep 3
 killall httpd
+sleep 3
 t_ServiceControl httpd start
 
 curl -s http://test/ | grep 'Virtual Host Test Page' > /dev/null 2>&1
@@ -26,6 +28,6 @@ t_CheckExitStatus $?
 
 # SteveCB: remove vhost-test.conf to prevent later tests 
 # that assume DocumentRoot is /var/www/html from failing
-rm /etc/httpd/conf.d/vhost-test.conf
+/bin/rm /etc/httpd/conf.d/vhost-test.conf
 t_ServiceControl httpd stop
 
diff --git a/tests/p_postgresql/1-config-postgresql.sh b/tests/p_postgresql/1-config-postgresql.sh
index 1fd1d6b..4603fee 100755
--- a/tests/p_postgresql/1-config-postgresql.sh
+++ b/tests/p_postgresql/1-config-postgresql.sh
@@ -11,6 +11,7 @@ then
    t_ServiceControl postgresql start
    sleep 15
 else
+   chmod 644 /etc/nsswitch.conf
    t_ServiceControl postgresql start
    sleep 15
 fi