From 834d5ec1eb66968c9e869dc8c867135968adb9fb Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: Jul 29 2019 17:24:52 +0000 Subject: Fixed sendmail test with journalctl dump to log Signed-off-by: Fabian Arrotin --- diff --git a/tests/p_sendmail/20_sendmail_mta.sh b/tests/p_sendmail/20_sendmail_mta.sh index f22b372..a29153f 100755 --- a/tests/p_sendmail/20_sendmail_mta.sh +++ b/tests/p_sendmail/20_sendmail_mta.sh @@ -13,6 +13,11 @@ if [ $MTA_ACCEPT == 0 ] fi sleep 1 + +if [ "$centos_ver" -eq "8" ]; then + t_Log "Dumping journalctl to /var/log/maillog" + journalctl -u sendmail >> /var/log/maillog +fi regex='250\ 2\.0\.0\ ([0-9A-Za-z]*)\ Message\ accepted\ for\ delivery' if [[ $mail =~ $regex ]] then diff --git a/tests/p_sendmail/30_sendmail_mta_ehlo.sh b/tests/p_sendmail/30_sendmail_mta_ehlo.sh index 68b6485..4bc1832 100755 --- a/tests/p_sendmail/30_sendmail_mta_ehlo.sh +++ b/tests/p_sendmail/30_sendmail_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 sendmail >> /var/log/maillog +fi + regex='250\ 2\.0\.0\ ([0-9A-Za-z]*)\ Message\ accepted\ for\ delivery' if [[ $mail =~ $regex ]] then