From 7a6f8c34c4124adbe2bcee451bb69d2309970dbd Mon Sep 17 00:00:00 2001
From: Thomas VIAL <github@ifusio.com>
Date: Sun, 1 Jan 2017 20:44:51 +0100
Subject: [PATCH] Changed variable assignment

---
 target/start-mailserver.sh | 24 ++++++++++++------------
 test/tests.bats            |  8 +++-----
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh
index 6ae9fa4f..28b465a1 100644
--- a/target/start-mailserver.sh
+++ b/target/start-mailserver.sh
@@ -7,18 +7,18 @@
 # Example: DEFAULT_VARS["KEY"]="VALUE"
 ##########################################################################
 declare -A DEFAULT_VARS
-DEFAULT_VARS["ENABLE_CLAMAV"]=${ENABLE_CLAMAV:=0}
-DEFAULT_VARS["ENABLE_SPAMASSASSIN"]=${ENABLE_SPAMASSASSIN:=0}
-DEFAULT_VARS["ENABLE_POP3"]=${ENABLE_POP3:=0}
-DEFAULT_VARS["ENABLE_FAIL2BAN"]=${ENABLE_FAIL2BAN:=0}
-DEFAULT_VARS["ENABLE_MANAGESIEVE"]=${ENABLE_MANAGESIEVE:=0}
-DEFAULT_VARS["ENABLE_FETCHMAIL"]=${ENABLE_FETCHMAIL:=0}
-DEFAULT_VARS["ENABLE_LDAP"]=${ENABLE_LDAP:=0}
-DEFAULT_VARS["ENABLE_SASLAUTHD"]=${ENABLE_SASLAUTHD:=0}
-DEFAULT_VARS["ONE_DIR"]=${ONE_DIR:=0}
-DEFAULT_VARS["SMTP_ONLY"]=${SMTP_ONLY:=0}
-DEFAULT_VARS["VIRUSMAILS_DELETE_DELAY"]=${VIRUSMAILS_DELETE_DELAY:=7}
-DEFAULT_VARS["DMS_DEBUG"]=${DMS_DEBUG:=0}
+DEFAULT_VARS["ENABLE_CLAMAV"]=${ENABLE_CLAMAV:-0}
+DEFAULT_VARS["ENABLE_SPAMASSASSIN"]=${ENABLE_SPAMASSASSIN:-0}
+DEFAULT_VARS["ENABLE_POP3"]=${ENABLE_POP3:-0}
+DEFAULT_VARS["ENABLE_FAIL2BAN"]=${ENABLE_FAIL2BAN:-0}
+DEFAULT_VARS["ENABLE_MANAGESIEVE"]=${ENABLE_MANAGESIEVE:-0}
+DEFAULT_VARS["ENABLE_FETCHMAIL"]=${ENABLE_FETCHMAIL:-0}
+DEFAULT_VARS["ENABLE_LDAP"]=${ENABLE_LDAP:-0}
+DEFAULT_VARS["ENABLE_SASLAUTHD"]=${ENABLE_SASLAUTHD:-0}
+DEFAULT_VARS["ONE_DIR"]=${ONE_DIR:-0}
+DEFAULT_VARS["SMTP_ONLY"]=${SMTP_ONLY:-0}
+DEFAULT_VARS["VIRUSMAILS_DELETE_DELAY"]=${VIRUSMAILS_DELETE_DELAY:-7}
+DEFAULT_VARS["DMS_DEBUG"]=${DMS_DEBUG:-0}
 ##########################################################################
 # << DEFAULT VARS
 ##########################################################################
diff --git a/test/tests.bats b/test/tests.bats
index 670e153c..8ce8ed9a 100644
--- a/test/tests.bats
+++ b/test/tests.bats
@@ -7,7 +7,7 @@ load 'test_helper/bats-assert/load'
 
 @test "checking configuration: hostname/domainname" {
   run docker run `docker inspect --format '{{ .Config.Image }}' mail`
-  assert_success
+  assert_failure
 }
 
 #
@@ -265,7 +265,7 @@ load 'test_helper/bats-assert/load'
   if [ $ENABLE_SPAMASSASSIN -eq 0 ]; then
     skip
   fi
-  run docker exec mail /bin/sh -c "grep 'Blocked SPAM' /var/log/mail/mail.log | grep spam@external.tld | wc -l"
+  run docker exec mail /bin/sh -c "grep 'Blocked SPAM' /var/log/mail/mail.log | wc -l"
   assert_output 1
 }
 
@@ -273,7 +273,7 @@ load 'test_helper/bats-assert/load'
   if [ $ENABLE_CLAMAV -eq 0 ]; then
     skip
   fi
-  run docker exec mail /bin/sh -c "grep 'Blocked INFECTED' /var/log/mail/mail.log | grep virus@external.tld | wc -l"
+  run docker exec mail /bin/sh -c "grep 'Blocked INFECTED' /var/log/mail/mail.log | wc -l"
   assert_output 1
 }
 
@@ -789,11 +789,9 @@ load 'test_helper/bats-assert/load'
 
   run docker exec mail /bin/sh -c "grep user3@domain.tld -i /tmp/docker-mailserver/postfix-accounts.cf"
   assert_failure
-  [ -z "$output" ]
 
   run docker exec mail /bin/sh -c "grep '^auser3@domain\.tld' -i /tmp/docker-mailserver/postfix-accounts.cf"
   assert_success
-  [ ! -z "$output" ]
 }
 
 @test "checking user updating password for user in /tmp/docker-mailserver/postfix-accounts.cf" {