Merge pull request #341 from jeckersb/rhel7-spec-fix

Fix failing persist_iptables test on RHEL7 and Fedora

spec/unit/classes/firewall_linux_spec.rb

@@ -7,8 +7,14 @@
   context 'RedHat like' do
     %w{RedHat CentOS Fedora}.each do |os|
       context "operatingsystem => #{os}" do
-        let(:facts) { facts_default.merge({ :operatingsystem => os }) }
-        it { should contain_class('firewall::linux::redhat').with_require('Package[iptables]') }
+        releases = (os == 'Fedora' ? [14,15] : [6,7])
+        releases.each do |osrel|
+          context "operatingsystemrelease => #{osrel}" do
+            let(:facts) { facts_default.merge({ :operatingsystem => os,
+                                                :operatingsystemrelease => osrel}) }
+            it { should contain_class('firewall::linux::redhat').with_require('Package[iptables]') }
+          end
+        end
       end
     end
   end

spec/unit/puppet/util/firewall_spec.rb

@@ -159,6 +159,7 @@
       it 'should raise a warning when exec fails' do
         allow(Facter.fact(:osfamily)).to receive(:value).and_return('RedHat')
         allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('RedHat')
+        allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('6')
 
         expect(subject).to receive(:execute).with(%w{/sbin/service iptables save}).
           and_raise(Puppet::ExecutionFailure, 'some error')