diff --git a/tests/p_sendmail/10_sendmail_smtp.sh b/tests/p_sendmail/10_sendmail_smtp.sh index dba02b1..7ec11dd 100755 --- a/tests/p_sendmail/10_sendmail_smtp.sh +++ b/tests/p_sendmail/10_sendmail_smtp.sh @@ -3,6 +3,6 @@ t_Log "Running $0 - Sendmail SMTP test." -echo "helo test" | nc -w 3 localhost 25 | grep -q '250' +echo "helo test" | nc -4 -w 3 localhost 25 | grep -q '250' t_CheckExitStatus $? diff --git a/tests/p_sendmail/20_sendmail_mta.sh b/tests/p_sendmail/20_sendmail_mta.sh index 69a5c38..38d4fbe 100755 --- a/tests/p_sendmail/20_sendmail_mta.sh +++ b/tests/p_sendmail/20_sendmail_mta.sh @@ -10,7 +10,7 @@ cat /dev/null > $MAILSPOOL ret_val=1 # send mail to localhost -echo -e "helo localhost\nmail from: root@localhost\nrcpt to: root@localhost\ndata\nt_functional test\n.\nquit\n" | nc -w 5 localhost 25 | grep -q "250 2.0.0" +echo -e "helo localhost\nmail from: root@localhost\nrcpt to: root@localhost\ndata\nt_functional test\n.\nquit\n" | nc -4 -w 5 localhost 25 | grep -q "250 2.0.0" if [ $? = 0 ] then t_Log 'Mail has been queued successfully' diff --git a/tests/p_sendmail/30_sendmail_mta_ehlo.sh b/tests/p_sendmail/30_sendmail_mta_ehlo.sh index dfc7274..63376bb 100755 --- a/tests/p_sendmail/30_sendmail_mta_ehlo.sh +++ b/tests/p_sendmail/30_sendmail_mta_ehlo.sh @@ -10,7 +10,7 @@ cat /dev/null > $MAILSPOOL ret_val=1 # send mail to localhost -echo -e "ehlo localhost\nmail from: root@localhost\nrcpt to: root@localhost\ndata\nt_functional test\n.\nquit\n" | nc -w 5 localhost 25 | grep -q "250 2.0.0" +echo -e "ehlo localhost\nmail from: root@localhost\nrcpt to: root@localhost\ndata\nt_functional test\n.\nquit\n" | nc -4 -w 5 localhost 25 | grep -q "250 2.0.0" if [ $? = 0 ] then t_Log 'Mail has been queued successfully' @@ -25,8 +25,7 @@ if [ $? = 0 ] SPOOLFILE=0 fi -if ([ $MTA_ACCEPT = 0 ] && [ $SPOOLFILE = 0 ]) - then +if [ "$MTA_ACCEPT" = "0" ] && [ "$SPOOLFILE" = "0" ] ; then ret_val=0 fi