Updated travisci file to fail on Puppet 4 failures

diff --git a/.travis.yml b/.travis.yml
index cbf6f11df62040f7f04841cffcb5d52a1f059eaa..7e8ed57bbde5e478446c667bb447c07c27bf5fef 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,8 +20,5 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
   - rvm: 1.8.7
     env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-  allow_failures:
-    - rvm: 2.1.6
-      env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
 notifications:
   email: false

diff --git a/spec/unit/classes/firewall_linux_spec.rb b/spec/unit/classes/firewall_linux_spec.rb
index e43c1e9f809d7ab5c0887e987074314c4d976190..52ca5f8d95c2bccbd574e98220f16a5d23f655d9 100644 (file)
--- a/spec/unit/classes/firewall_linux_spec.rb
+++ b/spec/unit/classes/firewall_linux_spec.rb
@@ -22,8 +22,11 @@ describe 'firewall::linux', :type => :class do
   context 'Debian like' do
     %w{Debian Ubuntu}.each do |os|
       context "operatingsystem => #{os}" do
-        let(:facts) { facts_default.merge({ :operatingsystem => os }) }
-        it { should contain_class('firewall::linux::debian').with_require('Package[iptables]') }
+        releases = (os == 'Debian' ? ['6','7','8'] : ['10.04','12.04','14.04'])
+        releases.each do |osrel|
+          let(:facts) { facts_default.merge({ :operatingsystem => os, :operatingsystemrelease => osrel}) }
+          it { should contain_class('firewall::linux::debian').with_require('Package[iptables]') }
+        end
       end
     end
   end