From 5e47262acd47261acdacce1b4a11dc47a6752afc Mon Sep 17 00:00:00 2001
From: Christoph Galuschka <christoph.galuschka@chello.at>
Date: Jun 10 2012 18:52:28 +0000
Subject: made some tests more verbose, added "killall httpd"-fix to webalizer test


---

diff --git a/tests/p_net-snmp/0-install_snmpd.sh b/tests/p_net-snmp/0-install_snmpd.sh
index 13af1ea..8cf63be 100755
--- a/tests/p_net-snmp/0-install_snmpd.sh
+++ b/tests/p_net-snmp/0-install_snmpd.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 # Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
+t_Log "Running $0 - attempting to install net-snmp"
+
 # Install net-snmp
 t_InstallPackage net-snmp
 
diff --git a/tests/p_procinfo/0-install_procinfo.sh b/tests/p_procinfo/0-install_procinfo.sh
index 1ae88e4..2651497 100755
--- a/tests/p_procinfo/0-install_procinfo.sh
+++ b/tests/p_procinfo/0-install_procinfo.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 # Author: Steve Barnes (steve@echo.id.au)
 #         Athmane Madjoudj <athmanem@gmail.com>
+#	  Christoph Galuschka <christoph.galuschka@chello.at>
+
+t_Log "Running $0 - attempting to install procinfo"
 
 if (t_GetPkgRel basesystem | grep -q el6)
 then
-   t_Log It seems to be a CentOS 6.x system, this test will be disabled
+   t_Log "It seems to be a CentOS 6.x system, this test will be disabled"
    exit 0
 else
    # ProcInfo Utility Package
diff --git a/tests/p_procinfo/5-test_procinfo.sh b/tests/p_procinfo/5-test_procinfo.sh
index cfd5996..c011bd7 100755
--- a/tests/p_procinfo/5-test_procinfo.sh
+++ b/tests/p_procinfo/5-test_procinfo.sh
@@ -1,16 +1,17 @@
 #!/bin/bash
 # Author: Steve Barnes (steve@echo.id.au)
 #         Athmane Madjoudj <athmanem@gmail.com>
+#	  Christoph Galuschka <christoph.galuschka@chello.at>
+
+t_Log "Running $0 - checking procinfo runs and returns non-zero exit status."
 
 if (t_GetPkgRel basesystem | grep -q el6)
 then
-   t_Log It seems to be a CentOS 6.x system, this test will be disabled
+   t_Log "It seems to be a CentOS 6.x system, this test will be disabled"
    exit 0
 else
-    t_Log "Running $0 - checking procinfo runs and returns non-zero exit status."
-
     if [ $SKIP_QA_HARNESS ]; then
-      echo "Skip, seems to fail on CI ..."
+      t_Log "Skip, seems to fail on CI ..."
     else
 
       PROCINFO=`which procinfo`
diff --git a/tests/p_webalizer/0-install_webalizer.sh b/tests/p_webalizer/0-install_webalizer.sh
index eaa03ab..a29c8b4 100755
--- a/tests/p_webalizer/0-install_webalizer.sh
+++ b/tests/p_webalizer/0-install_webalizer.sh
@@ -1,6 +1,17 @@
 #!/bin/bash
 # Author: Athmane Madjoudj <athmanem@gmail.com>
 
+t_Log "Running $0 - attempting to install webalizer"
+
 t_InstallPackage webalizer 
 t_InstallPackage httpd
-t_ServiceControl httpd restart
+t_ServiceControl httpd stop
+ps ax | grep -v grep | grep -q httpd
+if [ $? = 0 ]
+then
+  t_Log "httpd still running - killing"
+  killall -9 httpd
+fi
+sleep 1
+t_ServiceControl httpd start
+