From 4809d809e46ed5f6f7775961ce3b639e60f62199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <github+aem1eeshi1@raphink.net>
Date: Tue, 23 Aug 2016 12:15:09 +0200
Subject: [PATCH] Fix acceptance tests (#144)

* Ensure exim4 is stopped on Debian before testing
* Ensure sendmail ist stopped on RedHat systems before testing
* Support Ubuntu 16.04 instead of 12.04
---
 .travis.yml                     |  4 ++--
 metadata.json                   |  4 ++--
 spec/acceptance/postfix_spec.rb | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 21d6cff..560c7e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,14 +46,14 @@ matrix:
     sudo: required
     dist: trusty
     services: docker
-    env: BEAKER_set="ubuntu-12.04"
+    env: BEAKER_set="ubuntu-14.04"
     bundler_args:
     script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
   - rvm: default
     sudo: required
     dist: trusty
     services: docker
-    env: BEAKER_set="ubuntu-14.04"
+    env: BEAKER_set="ubuntu-16.04"
     bundler_args:
     script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
   - rvm: default
diff --git a/metadata.json b/metadata.json
index eadbd76..44d687f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -30,8 +30,8 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "12.04",
-        "14.04"
+        "14.04",
+        "16.04"
       ]
     },
     {
diff --git a/spec/acceptance/postfix_spec.rb b/spec/acceptance/postfix_spec.rb
index ccfbbc6..b03b54c 100644
--- a/spec/acceptance/postfix_spec.rb
+++ b/spec/acceptance/postfix_spec.rb
@@ -5,6 +5,22 @@ describe 'postfix class' do
   context 'default parameters' do
     it 'should work idempotently with no errors' do
       pp = <<-EOS
+        # Make sure the default mailer is stopped in docker containers
+        if $::operatingsystem == 'Debian' {
+          service { 'exim4':
+            ensure    => stopped,
+            hasstatus => false,
+            before    => Class['postfix'],
+          }
+        }
+        if $::osfamily == 'RedHat' {
+          service { 'sendmail':
+            ensure    => stopped,
+            hasstatus => false,
+            before    => Class['postfix'],
+          }
+        }
+
         class { 'postfix': }
       EOS
 
-- 
GitLab