From da4d713a56d5724ab607e7891ae056a6e7978d63 Mon Sep 17 00:00:00 2001 From: Thomas VIAL Date: Wed, 28 Dec 2016 16:23:06 +0100 Subject: [PATCH] Testing LDAP config and CLAMAV variant --- .travis.yml | 4 ++-- test/tests.bats | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 550eff22..848ed9b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ script: after_script: - make clean env: -- SMTP_ONLY=0 ENABLE_CLAMAV=1 ENABLE_SPAMASSASSIN=1 ENABLE_FAIL2BAN=1 ONE_DIR=1 ENABLE_POP3=1 ENABLE_MANAGESIEVE=1 ENABLE_FETCHMAIL=1 PERMIT_DOCKER=host DMS_DEBUG=0 SA_TAG=1.0 SA_TAG2=2.0 SA_KILL=3.0 VIRUSMAILS_DELETE_DELAY=7 SASL_PASSWD="external domain.com username:password" -- SMTP_ONLY=0 ENABLE_CLAMAV=0 ENABLE_SPAMASSASSIN=0 ENABLE_FAIL2BAN=0 ONE_DIR=0 ENABLE_POP3=0 ENABLE_MANAGESIEVE=0 ENABLE_FETCHMAIL=0 PERMIT_DOCKER=network DMS_DEBUG=1 +- SMTP_ONLY=0 ENABLE_LDAP=0 ENABLE_CLAMAV=1 ENABLE_SPAMASSASSIN=1 ENABLE_FAIL2BAN=1 ONE_DIR=1 ENABLE_POP3=1 ENABLE_MANAGESIEVE=1 ENABLE_FETCHMAIL=1 PERMIT_DOCKER=host DMS_DEBUG=0 SA_TAG=1.0 SA_TAG2=2.0 SA_KILL=3.0 VIRUSMAILS_DELETE_DELAY=7 SASL_PASSWD="external domain.com username:password" +- SMTP_ONLY=0 ENABLE_LDAP=0 ENABLE_CLAMAV=0 ENABLE_SPAMASSASSIN=0 ENABLE_FAIL2BAN=0 ONE_DIR=0 ENABLE_POP3=0 ENABLE_MANAGESIEVE=0 ENABLE_FETCHMAIL=0 PERMIT_DOCKER=network DMS_DEBUG=1 - SMTP_ONLY=1 ENABLE_LDAP=1 LDAP_SERVER_HOST=ldap LDAP_SEARCH_BASE=ou=people,dc=localhost,dc=localdomain LDAP_BIND_DN=cn=admin,dc=localhost,dc=localdomain ENABLE_SASLAUTHD=1 SASLAUTHD_MECHANISMS=ldap SASLAUTHD_LDAP_SERVER=ldap SASLAUTHD_LDAP_BIND_DN=cn=admin,dc=localhost,dc=localdomain SASLAUTHD_LDAP_PASSWORD=admin SASLAUTHD_LDAP_SEARCH_BASE=ou=people,dc=localhost,dc=localdomain POSTMASTER_ADDRESS=postmaster@localhost.localdomain notifications: diff --git a/test/tests.bats b/test/tests.bats index 1fb0b8f2..7516224c 100644 --- a/test/tests.bats +++ b/test/tests.bats @@ -17,19 +17,19 @@ } @test "checking process: clamav (enabled by ENABLE_CLAMAV=1)" { - if [ "$ENABLE_CLAMAV" -eq 0 ]; then + if [ $ENABLE_CLAMAV -eq 0 ]; then skip - elif [ "$ENABLE_CLAMAV" -eq 1 ]; then + elif [ $ENABLE_CLAMAV -eq 1 ]; then run docker exec mail /bin/bash -c "ps aux --forest | grep -v grep | grep '/usr/sbin/clamd'" [ "$status" -eq 0 ] fi } @test "checking process: clamav (disabled by ENABLE_CLAMAV=0)" { - if [ "$ENABLE_CLAMAV" -eq 0 ]; then + if [ $ENABLE_CLAMAV -eq 0 ]; then run docker exec mail /bin/bash -c "ps aux --forest | grep -v grep | grep '/usr/sbin/clamd'" [ "$status" -eq 1 ] - elif [" $ENABLE_CLAMAV" -eq 1 ]; then + elif [ $ENABLE_CLAMAV -eq 1 ]; then skip fi }