From d1b014141456734e30249a6b375c6a8b64f2bfc1 Mon Sep 17 00:00:00 2001
From: Christoph Galuschka <christoph.galuschka@chello.at>
Date: Sep 29 2013 10:22:26 +0000
Subject: Merge remote branch 'upstream/master'


---

diff --git a/tests/0_common/30_dns_works.sh b/tests/0_common/30_dns_works.sh
index 55510b6..4dbee5a 100755
--- a/tests/0_common/30_dns_works.sh
+++ b/tests/0_common/30_dns_works.sh
@@ -2,7 +2,7 @@
 
 t_Log "Running $0 - testing to see if DNS works"
 if [ $SKIP_QA_HARNESS -eq 1 ]; then 
-  HOST=wiki.centos.org 
+  HOST=ci.dev.centos.org 
 else
   HOST=repo.centos.qa
 fi
diff --git a/tests/p_arpwatch/10_arpwatch_test.sh b/tests/p_arpwatch/10_arpwatch_test.sh
new file mode 100755
index 0000000..9f518a5
--- /dev/null
+++ b/tests/p_arpwatch/10_arpwatch_test.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+#         Christoph Galuschka <christoph.galuschka@chello.at>
+
+t_Log "Running $0 - arpwatch on eth0"
+
+# Kill arpwatch instance from previous test
+# killall arpwatch
+
+# getting IP-address of default gateway
+defgw=$(route -n | grep 'UG[ \t]' | awk '{print $2}')
+if [ -z $defgw ]
+  then
+  t_Log "No default gateway, can't test arpwatch"
+  exit
+fi
+
+# setting path to arp.dat
+if (t_GetPkgRel basesystem | grep -q el5)
+  then
+  arpdat='/var/arpwatch/arp.dat'
+else
+  arpdat='/var/lib/arpwatch/arp.dat'
+fi
+
+# beginning and running test
+arpwatch
+sleep 4
+arp -d $defgw
+sleep 4
+ping -q -i 1 -c 5 $defgw
+killall arpwatch
+sleep 2
+more $arpdat
+grep -q $defgw $arpdat
+
+t_CheckExitStatus $?
+
+# cleaning up
+cat /dev/null > $arpdat
+
diff --git a/tests/p_arpwatch/arpwatch_test.sh b/tests/p_arpwatch/arpwatch_test.sh
deleted file mode 100755
index fd9ec86..0000000
--- a/tests/p_arpwatch/arpwatch_test.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#         Christoph Galuschka <christoph.galuschka@chello.at>
-
-t_Log "Running $0 - arpwatch on eth0"
-
-# Kill arpwatch instance from previous test
-killall arpwatch
-
-# getting IP-address of default gateway
-defgw=$(route -n | grep 'UG[ \t]' | awk '{print $2}')
-if [ -z $defgw ]
-  then
-  t_Log "No default gateway, can't test arpwatch"
-  exit
-fi
-
-# setting path to arp.dat
-if (t_GetPkgRel basesystem | grep -q el5)
-  then
-  arpdat='/var/arpwatch/arp.dat'
-else
-  arpdat='/var/lib/arpwatch/arp.dat'
-fi
-
-# beginning and running test
-arpwatch
-sleep 4
-arp -d $defgw
-sleep 2
-ping -q -i 0.5 -c 5 $defgw
-killall arpwatch
-sleep 2
-grep -q $defgw $arpdat
-
-t_CheckExitStatus $?
-
-# cleaning up
-cat /dev/null > $arpdat
-
diff --git a/tests/p_iputils/tracepath_test.sh b/tests/p_iputils/tracepath_test.sh
index e625da0..b8112ab 100755
--- a/tests/p_iputils/tracepath_test.sh
+++ b/tests/p_iputils/tracepath_test.sh
@@ -5,7 +5,7 @@ TEST=tracepath
 
 # Testing availability of network
 if [ $SKIP_QA_HARNESS -eq 1 ]; then
-  HOST="wiki.centos.org"
+  HOST="ci.dev.centos.org"
 else
   HOST="repo.centos.qa"
 fi
diff --git a/tests/p_mod_wsgi/mod_wsgi_test.sh b/tests/p_mod_wsgi/mod_wsgi_test.sh
index 95a0aee..65a049f 100755
--- a/tests/p_mod_wsgi/mod_wsgi_test.sh
+++ b/tests/p_mod_wsgi/mod_wsgi_test.sh
@@ -3,7 +3,8 @@
 t_Log "Running $0 - Apache httpd mod_wsgi is functional"
 if (t_GetPkgRel basesystem | grep -q el6); then
 	while [ `ps fax | grep 'sbin/httpd' | grep -v grep  | wc -l` -gt 0 ]; do
-	  t_ServiceControl httpd stop
+      #t_ServiceControl httpd stop
+      killall -s KILL httpd
 	  sleep 1
 	done
 
@@ -31,4 +32,4 @@ EOF
 
 else 
     echo "Skipped on CentOS 5"
-fi
\ No newline at end of file
+fi
diff --git a/tests/p_mtr/mtr_test.sh b/tests/p_mtr/mtr_test.sh
index ee4a439..862314e 100755
--- a/tests/p_mtr/mtr_test.sh
+++ b/tests/p_mtr/mtr_test.sh
@@ -5,7 +5,7 @@ TEST=mtr
 
 # Testing availability of network
 if [ $SKIP_QA_HARNESS -eq 1 ]; then
-  HOST="wiki.centos.org"
+  HOST="ci.dev.centos.org"
 else
   HOST="repo.centos.qa"
 fi
diff --git a/tests/p_postfix/40_postfix_sasl.sh b/tests/p_postfix/40_postfix_sasl.sh
index 7323d04..3ac5c04 100755
--- a/tests/p_postfix/40_postfix_sasl.sh
+++ b/tests/p_postfix/40_postfix_sasl.sh
@@ -4,7 +4,7 @@
 t_Log "Running $0 - Postfix plain SASL test."
 t_Log "Installing prerequisits"
 
-t_InstallPackage dovecot nc
+t_InstallPackage dovecot
 
 #creating backups of changed files
 cp -a /etc/postfix/main.cf /etc/postfix/main.cf_testing
diff --git a/tests/p_postfix/50_postfix_tls.sh b/tests/p_postfix/50_postfix_tls.sh
index 8e2add3..0e4557f 100755
--- a/tests/p_postfix/50_postfix_tls.sh
+++ b/tests/p_postfix/50_postfix_tls.sh
@@ -1,4 +1,4 @@
-y#!/bin/sh
+#!/bin/sh
 # Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
 t_Log "Running $0 - Postfix plain SASL test."
diff --git a/tests/p_traceroute/traceroute_test.sh b/tests/p_traceroute/traceroute_test.sh
index a92e653..b311abd 100755
--- a/tests/p_traceroute/traceroute_test.sh
+++ b/tests/p_traceroute/traceroute_test.sh
@@ -5,7 +5,7 @@ TEST=traceroute
 
 # Testing availability of network
 if [ $SKIP_QA_HARNESS -eq 1 ]; then
-  HOST="wiki.centos.org"
+  HOST="ci.dev.centos.org"
 else
   HOST="repo.centos.qa"
 fi