From b34a79310a7fb0d0d2fead67cffb7f7abb4c75b1 Mon Sep 17 00:00:00 2001 From: Germain Masse Date: Mon, 14 Oct 2019 13:25:44 +0000 Subject: [PATCH 1/3] Privacy test email no more tagged as SPAM. ClamAV and SA disabled to avoid time-out on low perf system --- test/mail_privacy.bats | 9 +-------- test/test-files/email-templates/send-privacy-email.txt | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/test/mail_privacy.bats b/test/mail_privacy.bats index 2169a6fb..44af92af 100644 --- a/test/mail_privacy.bats +++ b/test/mail_privacy.bats @@ -12,13 +12,6 @@ function setup_file() { docker run -d --name mail_privacy \ -v "`pwd`/test/config":/tmp/docker-mailserver \ -v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \ - -e ENABLE_CLAMAV=1 \ - -e ENABLE_SPAMASSASSIN=1 \ - -e SA_TAG=-5.0 \ - -e SA_TAG2=2.0 \ - -e SA_KILL=3.0 \ - -e SA_SPAM_SUBJECT="SPAM: " \ - -e VIRUSMAILS_DELETE_DELAY=7 \ -e SASL_PASSWD="external-domain.com username:password" \ -e ENABLE_MANAGESIEVE=1 \ --cap-add=SYS_PTRACE \ @@ -59,4 +52,4 @@ function teardown_file() { @test "last" { skip 'this test is only there to reliably mark the end for the teardown_file' -} \ No newline at end of file +} diff --git a/test/test-files/email-templates/send-privacy-email.txt b/test/test-files/email-templates/send-privacy-email.txt index d687774b..2273a46c 100644 --- a/test/test-files/email-templates/send-privacy-email.txt +++ b/test/test-files/email-templates/send-privacy-email.txt @@ -9,7 +9,7 @@ To: Some User User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 Subject: Test ESMTP Auth LOGIN and remove privacy -testing +This is a test mail. . QUIT From b204f7d14c4b488a946d3c18b3b7cb45baf1878b Mon Sep 17 00:00:00 2001 From: Germain Masse Date: Mon, 14 Oct 2019 15:30:22 +0000 Subject: [PATCH 2/3] remove travis notification --- .travis.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 48f41d0c..2c79678b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,12 +18,3 @@ script: - make generate-accounts run generate-accounts-after-run fixtures tests after_script: - make clean -notifications: - slack: - secure: TTo1z9nbZCWcIdfPwypubNa3y+pwvfgDGlzEVAGEuK7uuIpmEoAcAUNSSPTnbewDGHnDl8t/ml93MtvP+a+IVuAKytMqF39PHyoZO7aUl9J62V+G75OmnyGjXGJm40pQosCS6LzqoRRYXotl9+fwH568Kf4ifXCrMZX1d+ir7Ww= - webhooks: - urls: - - https://webhooks.gitter.im/e/7ec65291bfb4bf1f8518 - on_success: always - on_failure: always - on_start: never From 4049b62bc02fb71e149ab995acd9f9891b5b204e Mon Sep 17 00:00:00 2001 From: Germain Masse Date: Wed, 16 Oct 2019 08:58:20 +0000 Subject: [PATCH 3/3] Revert "remove travis notification" This reverts commit b204f7d14c4b488a946d3c18b3b7cb45baf1878b. --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2c79678b..48f41d0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,3 +18,12 @@ script: - make generate-accounts run generate-accounts-after-run fixtures tests after_script: - make clean +notifications: + slack: + secure: TTo1z9nbZCWcIdfPwypubNa3y+pwvfgDGlzEVAGEuK7uuIpmEoAcAUNSSPTnbewDGHnDl8t/ml93MtvP+a+IVuAKytMqF39PHyoZO7aUl9J62V+G75OmnyGjXGJm40pQosCS6LzqoRRYXotl9+fwH568Kf4ifXCrMZX1d+ir7Ww= + webhooks: + urls: + - https://webhooks.gitter.im/e/7ec65291bfb4bf1f8518 + on_success: always + on_failure: always + on_start: never