From 5a90201d687c63a41d5c14bb1e34eaf927900311 Mon Sep 17 00:00:00 2001 From: Christoph Galuschka Date: Oct 04 2014 18:09:21 +0000 Subject: added sleep to allow local mail delivery --- diff --git a/tests/p_exim/20_exim_mta_helo-test.sh b/tests/p_exim/20_exim_mta_helo-test.sh index 437f9f7..8b463c9 100755 --- a/tests/p_exim/20_exim_mta_helo-test.sh +++ b/tests/p_exim/20_exim_mta_helo-test.sh @@ -21,6 +21,7 @@ if [ $centos_ver == '5' ] regex='250\ OK\ id\=([0-9A-Za-z-]*)' if [[ $mail =~ $regex ]] then + sleep 1 grep -q "${BASH_REMATCH[1]} Completed" /var/log/exim/main.log DELIVERED=$? fi diff --git a/tests/p_exim/30_exim_mta_ehlo-test.sh b/tests/p_exim/30_exim_mta_ehlo-test.sh index 16bed68..bb32f1d 100755 --- a/tests/p_exim/30_exim_mta_ehlo-test.sh +++ b/tests/p_exim/30_exim_mta_ehlo-test.sh @@ -18,6 +18,7 @@ if [ $centos_ver == '5' ] regex='250\ OK\ id\=([0-9A-Za-z-]*)' if [[ $mail =~ $regex ]] then + sleep 1 grep -q "${BASH_REMATCH[1]} Completed" /var/log/exim/main.log DELIVERED=$? fi diff --git a/tests/p_exim/_helper_exim_ehlo.expect b/tests/p_exim/_helper_exim_ehlo.expect index d36e962..4ca9624 100755 --- a/tests/p_exim/_helper_exim_ehlo.expect +++ b/tests/p_exim/_helper_exim_ehlo.expect @@ -6,6 +6,7 @@ spawn telnet localhost 25 expect "220 *" send -- "ehlo localhost\n" expect -- "250-PIPELINING" +sleep 1 send -- "mail from: root@localhost\nrcpt to: eximtest@localhost\ndata\nt_functional test\n.\n" expect -- "250\ OK" send -- "quit\n"