From 4d41f3857643e1f34cabce129af1684cbd03a001 Mon Sep 17 00:00:00 2001
From: Thomas VIAL <github@ifusio.com>
Date: Wed, 17 Aug 2016 14:06:48 +0200
Subject: [PATCH] Refactored.

---
 .travis.yml             | 29 ++++++++++-------------------
 test/env_SMTP_ONLY.bats |  3 +++
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2dd5bbea..6bf3a6e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,28 +11,19 @@ after_script:
 env:
   - ENABLE_POP3=0 
   - ENABLE_POP3=1
+  - SA_TAG=    SA_TAG2=    SA_KILL=
+  - SA_TAG=1.0 SA_TAG2=2.0 SA_KILL=3.0
+  - SASL_PASSWD=
+  - SASL_PASSWD="external-domain.com username:password"
+  - SMTP_ONLY=0
+  - SMTP_ONLY=1
   # - ENABLE_FAIL2BAN=0
   # - ENABLE_FAIL2BAN=1
   # - ENABLE_MANAGESIEVE=0
   # - ENABLE_MANAGESIEVE=1
-  # - SMTP_ONLY=0
-  # - SMTP_ONLY=1
-  - SASL_PASSWD=
-  - SASL_PASSWD="external-domain.com username:password"
   # - ONE_DIR=0
   # - ONE_DIR=1
-  # - SA_TAG=
-  # - SA_TAG=1.0
-  # - SA_TAG2=
-  # - SA_TAG2=2.0
-  # - SA_KILL=
-  # - SA_KILL=3.0
-
-
-
-
-# SSL_TYPE
-# 
-# DISABLE_AMAVIS=0
-# DISABLE_SPAMASSASSIN=1
-# DISABLE_CLAMAV=1
+  # - SSL_TYPE
+  # - DISABLE_AMAVIS=0
+  # - DISABLE_SPAMASSASSIN=1
+  # - DISABLE_CLAMAV=1
diff --git a/test/env_SMTP_ONLY.bats b/test/env_SMTP_ONLY.bats
index 7d90ea3c..339ea76c 100644
--- a/test/env_SMTP_ONLY.bats
+++ b/test/env_SMTP_ONLY.bats
@@ -1,4 +1,7 @@
 @test "checking process: dovecot imaplogin (disabled using SMTP_ONLY)" {
+  if [ "$SMTP_ONLY" != 1 ]; then
+    skip
+  fi
   run docker exec mail_smtponly /bin/bash -c "ps aux --forest | grep -v grep | grep '/usr/sbin/dovecot'"
   [ "$status" -eq 1 ]
 }
\ No newline at end of file