From 15dd63d5667cbda667ab3a71a9be7c93da226162 Mon Sep 17 00:00:00 2001 From: youtous Date: Sat, 2 May 2020 18:55:29 +0200 Subject: [PATCH] add test case no move to Junk --- test/mail_spam_junk_folder.bats | 42 ++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/test/mail_spam_junk_folder.bats b/test/mail_spam_junk_folder.bats index bce9ee85..3b17c92e 100644 --- a/test/mail_spam_junk_folder.bats +++ b/test/mail_spam_junk_folder.bats @@ -2,7 +2,7 @@ load 'test_helper/common' # Test case # --------- -# When SPAMASSASSIN_SPAM_TO_INBOX=1, spam messages must be delivered and moved to the Junk folder. +# When SPAMASSASSIN_SPAM_TO_INBOX=1, spam messages must be delivered and eventually (MOVE_SPAM_TO_JUNK=1) moved to the Junk folder. function setup() { @@ -14,35 +14,61 @@ function teardown() { } function setup_file() { - docker run -d --name mail_spam_moved \ + docker run -d --name mail_spam_moved_junk \ -v "`pwd`/test/config":/tmp/docker-mailserver \ -v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \ -e ENABLE_SPAMASSASSIN=1 \ -e SPAMASSASSIN_SPAM_TO_INBOX=1 \ + -e MOVE_SPAM_TO_JUNK=1 \ -e SA_SPAM_SUBJECT="SPAM: " \ -h mail.my-domain.com -t "${NAME}" - wait_for_finished_setup_in_container mail_spam_moved + wait_for_finished_setup_in_container mail_spam_moved_junk + + docker run -d --name mail_spam_moved_new \ + -v "`pwd`/test/config":/tmp/docker-mailserver \ + -v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \ + -e ENABLE_SPAMASSASSIN=1 \ + -e SPAMASSASSIN_SPAM_TO_INBOX=1 \ + -e MOVE_SPAM_TO_JUNK=0 \ + -e SA_SPAM_SUBJECT="SPAM: " \ + -h mail.my-domain.com -t "${NAME}" + + wait_for_finished_setup_in_container mail_spam_moved_new } function teardown_file() { - docker rm -f mail_spam_moved + docker rm -f mail_spam_moved_new + docker rm -f mail_spam_moved_junk } @test "first" { skip 'this test must come first to reliably identify when to run setup_file' } -@test "checking amavis: spam message is delivered and moved to the Junk folder" { +@test "checking amavis: spam message is delivered and moved to the Junk folder (MOVE_SPAM_TO_JUNK=1)" { # send a spam message - run docker exec mail_spam_moved /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/amavis-spam.txt" + run docker exec mail_spam_moved_junk /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/amavis-spam.txt" assert_success - run repeat_until_success_or_timeout 20 sh -c "docker logs mail_spam_moved | grep 'Passed SPAM {RelayedTaggedInbound,Quarantined}'" + run repeat_until_success_or_timeout 20 sh -c "docker logs mail_spam_moved_junk | grep 'Passed SPAM {RelayedTaggedInbound,Quarantined}'" assert_success # spam moved to Junk folder - run repeat_until_success_or_timeout 20 sh -c "docker exec mail_spam_moved sh -c 'grep \"Subject: SPAM: \" /var/mail/localhost.localdomain/user1/.Junk/new/ -R'" + run repeat_until_success_or_timeout 20 sh -c "docker exec mail_spam_moved_junk sh -c 'grep \"Subject: SPAM: \" /var/mail/localhost.localdomain/user1/.Junk/new/ -R'" + assert_success +} + +@test "checking amavis: spam message is delivered to INBOX (MOVE_SPAM_TO_JUNK=0)" { + # send a spam message + run docker exec mail_spam_moved_new /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/amavis-spam.txt" + assert_success + + run repeat_until_success_or_timeout 20 sh -c "docker logs mail_spam_moved_new | grep 'Passed SPAM {RelayedTaggedInbound,Quarantined}'" + assert_success + + # spam moved to INBOX + run repeat_until_success_or_timeout 20 sh -c "docker exec mail_spam_moved_new sh -c 'grep \"Subject: SPAM: \" /var/mail/localhost.localdomain/user1/new/ -R'" assert_success }