From dbcea3783f826e9eecc57ae1d2dcefecc935aae0 Mon Sep 17 00:00:00 2001 From: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com> Date: Sat, 28 Mar 2026 20:38:36 +0100 Subject: [PATCH] tests: update tests associated with Rspamd Signed-off-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com> --- test/tests/parallel/set1/spam_virus/rspamd_full.bats | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/tests/parallel/set1/spam_virus/rspamd_full.bats b/test/tests/parallel/set1/spam_virus/rspamd_full.bats index cf87ef9d..df2d8dd1 100644 --- a/test/tests/parallel/set1/spam_virus/rspamd_full.bats +++ b/test/tests/parallel/set1/spam_virus/rspamd_full.bats @@ -139,7 +139,7 @@ function teardown_file() { _default_teardown ; } _service_log_should_contain_string 'rspamd' 'S (no action)' _print_mail_log_for_msgid 'rspamd-test-email-pass' - assert_output --partial "stored mail into mailbox 'INBOX'" + assert_output --partial 'saved mail to INBOX' _count_files_in_directory_in_container /var/mail/localhost.localdomain/user1/new/ 3 } @@ -153,7 +153,7 @@ function teardown_file() { _default_teardown ; } assert_output --partial '5.7.1 Gtube pattern' _print_mail_log_for_msgid 'dms-test-email-spam' - refute_output --partial "stored mail into mailbox 'INBOX'" + refute_output --partial 'saved mail to INBOX' assert_failure _count_files_in_directory_in_container /var/mail/localhost.localdomain/user1/new/ 3 @@ -168,7 +168,7 @@ function teardown_file() { _default_teardown ; } assert_output --partial '5.7.1 ClamAV FOUND VIRUS "Eicar-Signature"' _print_mail_log_for_msgid 'dms-test-email-spam' - refute_output --partial "stored mail into mailbox 'INBOX'" + refute_output --partial 'saved mail to INBOX' assert_failure _count_files_in_directory_in_container /var/mail/localhost.localdomain/user1/new/ 3 @@ -258,7 +258,7 @@ function teardown_file() { _default_teardown ; } _service_log_should_contain_string 'rspamd' 'rewrite subject "Gtube pattern"' _print_mail_log_for_msgid 'rspamd-test-email-rewrite_subject' - assert_output --partial "stored mail into mailbox 'INBOX'" + assert_output --partial 'saved mail to INBOX' # check that the inbox contains the subject-rewritten e-mail _run_in_container_bash "grep --fixed-strings 'Subject: *** SPAM ***' /var/mail/localhost.localdomain/user1/new/*"