From 7c8dc10a045892eaa9626e7ac688de6c6208f9c5 Mon Sep 17 00:00:00 2001
From: Athmane Madjoudj <athmanem@gmail.com>
Date: Mar 17 2012 06:45:19 +0000
Subject: Fix postfix and sendmail tests


---

diff --git a/tests/p_postfix/postfix_smtp.sh b/tests/p_postfix/postfix_smtp.sh
index ff862af..64a76f9 100755
--- a/tests/p_postfix/postfix_smtp.sh
+++ b/tests/p_postfix/postfix_smtp.sh
@@ -3,6 +3,6 @@
 
 t_Log "Running $0 - Postfix SMTP test."
 
-echo "helo test" | nc  localhost 25 | grep '250'
+echo "helo test" | nc -w 3 localhost 25 | grep '250'
 
 t_CheckExitStatus $?
diff --git a/tests/p_sendmail/0-install_sendmail.sh b/tests/p_sendmail/0-install_sendmail.sh
index fffbd86..4711843 100755
--- a/tests/p_sendmail/0-install_sendmail.sh
+++ b/tests/p_sendmail/0-install_sendmail.sh
@@ -4,8 +4,9 @@
 t_InstallPackage sendmail
 
 # Remove other MTAs
-t_RemovePackage postfix exim
 t_ServiceControl postfix stop
 t_ServiceControl exim stop
+sleep 3
+t_RemovePackage postfix exim
 
 t_ServiceControl sendmail start
diff --git a/tests/p_sendmail/sendmail_smtp.sh b/tests/p_sendmail/sendmail_smtp.sh
index 108fb3e..9383774 100755
--- a/tests/p_sendmail/sendmail_smtp.sh
+++ b/tests/p_sendmail/sendmail_smtp.sh
@@ -3,6 +3,6 @@
 
 t_Log "Running $0 - Sendmail SMTP test."
 
-echo "helo test" | nc  localhost 25 | grep '250'
+echo "helo test" | nc -w 3 localhost 25 | grep '250'
 
 t_CheckExitStatus $?