adjust helpers to new helper filter

This commit is contained in:
georglauterbach 2024-01-20 12:25:23 +01:00
parent aaeea8af81
commit b3a6a7b103
No known key found for this signature in database
GPG Key ID: F367F7C43C118578
1 changed files with 4 additions and 4 deletions

View File

@ -109,7 +109,7 @@ function teardown_file() { _default_teardown ; }
} }
@test 'normal mail passes fine' { @test 'normal mail passes fine' {
_service_log_should_contain_string 'rspamd' 'F \(no action\)' _service_log_should_contain_string 'rspamd' 'F (no action)'
_print_mail_log_for_msgid 'rspamd-test-email-pass' _print_mail_log_for_msgid 'rspamd-test-email-pass'
assert_output --partial "stored mail into mailbox 'INBOX'" assert_output --partial "stored mail into mailbox 'INBOX'"
@ -118,7 +118,7 @@ function teardown_file() { _default_teardown ; }
} }
@test 'detects and rejects spam' { @test 'detects and rejects spam' {
_service_log_should_contain_string 'rspamd' 'S \(reject\)' _service_log_should_contain_string 'rspamd' 'S (reject)'
_service_log_should_contain_string 'rspamd' 'reject "Gtube pattern"' _service_log_should_contain_string 'rspamd' 'reject "Gtube pattern"'
_print_mail_log_of_queue_id_from_msgid 'dms-test-email-spam' _print_mail_log_of_queue_id_from_msgid 'dms-test-email-spam'
@ -133,7 +133,7 @@ function teardown_file() { _default_teardown ; }
} }
@test 'detects and rejects virus' { @test 'detects and rejects virus' {
_service_log_should_contain_string 'rspamd' 'T \(reject\)' _service_log_should_contain_string 'rspamd' 'T (reject)'
_service_log_should_contain_string 'rspamd' 'reject "ClamAV FOUND VIRUS "Eicar-Signature"' _service_log_should_contain_string 'rspamd' 'reject "ClamAV FOUND VIRUS "Eicar-Signature"'
_print_mail_log_of_queue_id_from_msgid 'rspamd-test-email-virus' _print_mail_log_of_queue_id_from_msgid 'rspamd-test-email-virus'
@ -225,7 +225,7 @@ function teardown_file() { _default_teardown ; }
_run_in_container_bash '[[ -f /usr/lib/dovecot/sieve-global/after/spam_to_junk.svbin ]]' _run_in_container_bash '[[ -f /usr/lib/dovecot/sieve-global/after/spam_to_junk.svbin ]]'
assert_success assert_success
_service_log_should_contain_string 'rspamd' 'S \(add header\)' _service_log_should_contain_string 'rspamd' 'S (add header)'
_service_log_should_contain_string 'rspamd' 'add header "Gtube pattern"' _service_log_should_contain_string 'rspamd' 'add header "Gtube pattern"'
_print_mail_log_for_msgid 'rspamd-test-email-header' _print_mail_log_for_msgid 'rspamd-test-email-header'