From 2539f02dd314a77540e3e30f8f32074cbbcdf720 Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: Jul 29 2019 17:22:15 +0000 Subject: Fixed postfix test with journalctl dump to log Signed-off-by: Fabian Arrotin --- diff --git a/tests/p_postfix/20_postfix_mta.sh b/tests/p_postfix/20_postfix_mta.sh index a7a354d..303f452 100755 --- a/tests/p_postfix/20_postfix_mta.sh +++ b/tests/p_postfix/20_postfix_mta.sh @@ -13,6 +13,12 @@ if [ $MTA_ACCEPT == 0 ] fi sleep 1 + +if [ "$centos_ver" -eq "8" ]; then + t_Log "Dumping journalctl to /var/log/maillog" + journalctl -u postfix >> /var/log/maillog +fi + regex='250\ 2\.0\.0\ Ok\:\ queued\ as\ ([0-9A-Z]*).*' if [[ $mail =~ $regex ]] then diff --git a/tests/p_postfix/30_postfix_mta_ehlo.sh b/tests/p_postfix/30_postfix_mta_ehlo.sh index 45c21bf..6158bc9 100755 --- a/tests/p_postfix/30_postfix_mta_ehlo.sh +++ b/tests/p_postfix/30_postfix_mta_ehlo.sh @@ -13,6 +13,12 @@ if [ $MTA_ACCEPT == 0 ] fi sleep 1 + +if [ "$centos_ver" -eq "8" ]; then + t_Log "Dumping journalctl to /var/log/maillog" + journalctl -u postfix >> /var/log/maillog +fi + regex='250\ 2\.0\.0\ Ok\:\ queued\ as\ ([0-9A-Z]*).*' if [[ $mail =~ $regex ]] then