tests/sendmail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tests

Browse source
This commit is contained in:
František Hrdina 2025-02-25 14:31:24 +01:00
commit 66b86fa382
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Sanity/got-audit/runtest.sh
View file

@ -34,6 +34,7 @@ rlJournalStart
rlPhaseStartCleanup
rlServiceRestore sendmail
rlFileSubmit $auditfile
rlRun "popd"
rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
rlPhaseEnd

2
Sanity/init-script-LSB/runtest.sh
View file

@ -47,7 +47,7 @@ rlJournalStart
for i in $(rpm -q --whatprovides MTA --queryformat="%{name} "); do
rlServiceStop $i
done
rlRun "alternatives --set mta /usr/sbin/sendmail.sendmail"
rlRun "alternatives --set mta $(rpm --eval '%{_sbindir}')/sendmail.sendmail"
rlPhaseEnd

8
functionality/selftest/runtest.sh
View file

@ -39,7 +39,7 @@ rlJournalStart
rlAssertRpm procmail
rlAssertRpm m4
if (rlIsRHEL '<=8' || rlIsCentOS '<=8'); then
if (rlIsRHELLike '<=8'); then
rlAssertRpm mailx
rlAssertRpm procps-ng
fi
@ -52,7 +52,7 @@ rlJournalStart
# hostname package is going to be removed from RHEL9 (probably)...
# replace call of `hostname` with appropriate replacement (should be hostnamectl)
(rlIsRHEL '<9' || rlIsCentOS '<9') && HOSTNAME=`hostname` || HOSTNAME=`hostnamectl status --static`
(rlIsRHELLike '<9') && HOSTNAME=`hostname` || HOSTNAME=`hostnamectl status --static`
rlRun "adduser $USER1"
rlRun "DIR=\$(mktemp -d)" 0 "Creating tmp directory for messages/outputs"
@ -68,7 +68,7 @@ rlJournalStart
pkill master
service postfix status --no-pager && rlServiceStop postfix
service sendmail status --no-pager && rlServiceStop sendmail
rlRun "alternatives --set mta /usr/sbin/sendmail.sendmail"
rlRun "alternatives --set mta $(rpm --eval '%{_sbindir}')/sendmail.sendmail"
rlRun "pushd /etc/mail"
rlRun "make"
@ -123,7 +123,7 @@ EOF
#################### TEST PHASE ####################
rlPhaseStartTest "There is mail from previous staff"
sleep 10
if (rlIsRHEL '>=9' || rlIsCentOS '>=9' || rlIsFedora); then
if (rlIsRHELLike '>=9' || rlIsFedora); then
cat /var/mail/$USER1 > $DIR/mail.temp
else

4
functionality/singlehost/runtest.sh
View file

@ -68,7 +68,7 @@ rlJournalStart
service postfix status --no-pager && rlServiceStop postfix
service sendmail status --no-pager && rlServiceStop sendmail
rlRun "alternatives --set mta /usr/sbin/sendmail.sendmail"
rlRun "alternatives --set mta $(rpm --eval '%{_sbindir}')/sendmail.sendmail"
rlRun "cd /etc/mail"
rlRun "sudo make"
@ -112,7 +112,7 @@ EOF
rlRun "/usr/sbin/sendmail -q"
sleep 30
if (rlIsRHEL '>=9' || rlIsCentOS '>=9' || rlIsFedora); then
if (rlIsRHELLike '>=9' || rlIsFedora); then
rlRun "cat /var/spool/mail/$USER1 > $mail_tmp"
else
mail << EOF > /a.temp