From 9328c74a232fea586413e0ac561e4c71b618e31e Mon Sep 17 00:00:00 2001
From: Christoph Galuschka <christoph.galuschka@chello.at>
Date: Nov 17 2012 19:58:29 +0000
Subject: made tests more verbose (added t_Log to know which script runs)


---

diff --git a/tests/p_exim/0-install_exim.sh b/tests/p_exim/0-install_exim.sh
index 4685ddc..d50c44c 100755
--- a/tests/p_exim/0-install_exim.sh
+++ b/tests/p_exim/0-install_exim.sh
@@ -2,6 +2,8 @@
 # Author: Athmane Madjoudj <athmanem@gmail.com>
 #	  Christoph Galuschka <christoph.galuschka@chello.at>
 
+t_Log "Running $0 - remove unused MTAs and install exim"
+
 if (t_GetPkgRel basesystem | grep -q el5)
 then
   t_InstallPackage exim
diff --git a/tests/p_postfix/0-install_postfix.sh b/tests/p_postfix/0-install_postfix.sh
index 9edb4a7..db7b1ec 100755
--- a/tests/p_postfix/0-install_postfix.sh
+++ b/tests/p_postfix/0-install_postfix.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
 # Author: Athmane Madjoudj <athmanem@gmail.com>
 
+t_Log "Running $0 - remove unused MTAs and install postfix"
+
 # Remove other MTAs
 t_ServiceControl sendmail stop
 t_ServiceControl exim stop
 sleep 3
-t_RemovePackage sendmail
-t_RemovePackage exim
+t_RemovePackage sendmail exim
 
 # Postfix
 t_InstallPackage postfix
diff --git a/tests/p_postfix/1-test-sendmail.sh b/tests/p_postfix/1-test-sendmail.sh
deleted file mode 100755
index 23c1184..0000000
--- a/tests/p_postfix/1-test-sendmail.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# Author: Christoph Galuschka <christoph.galuschka@chello.at>
-
-t_Log "Running $0 - testing if /usr/sbin/sendmail for postfix is sane."
-
-mta=$(ls -H /usr/sbin/sendmail)
-
-if [ $mta == '/usr/sbin/sendmail' ]
-  then
-  t_Log "link to sendmail seems to be sane"
-  ret_val=0
-else
-  t_Log "link to sendmail seems to be wrong"
-  ret_val=1
-fi
-
-t_CheckExitStatus $ret_val