Remove/Adjust Spec test cases

diff --git a/spec/unit/classes/firewall_linux_debian_spec.rb b/spec/unit/classes/firewall_linux_debian_spec.rb
index 73833513328063bc2c1a7202c54fb31ffa063a3c..f807c0a252529f7584070c8f16986c8dc839c1ad 100644 (file)
--- a/spec/unit/classes/firewall_linux_debian_spec.rb
+++ b/spec/unit/classes/firewall_linux_debian_spec.rb
@@ -3,52 +3,13 @@
 require 'spec_helper'
 
 describe 'firewall::linux::debian', type: :class do
-  context 'with Debian 8' do
-    let(:facts) do
-      {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: 'jessie/sid',
-      }
-    end
-
-    it {
-      is_expected.to contain_package('iptables-persistent').with(
-        ensure: 'installed',
-      )
-    }
-    it {
-      is_expected.to contain_service('netfilter-persistent').with(
-        ensure: nil,
-        enable: 'true',
-        require: 'Package[iptables-persistent]',
-      )
-    }
-  end
 
-  context 'with deb8 enable => false' do
-    let(:facts) do
-      {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: 'jessie/sid',
-      }
-    end
-    let(:params) { { enable: 'false' } }
-
-    it {
-      is_expected.to contain_service('netfilter-persistent').with(
-        enable: 'false',
-      )
-    }
-  end
-
-  context 'with Debian 8, alt operatingsystem' do
+  context 'with Debian 10' do
     let(:facts) do
       {
         osfamily: 'Debian',
         operatingsystem: 'Debian',
-        operatingsystemrelease: '8.0',
+        operatingsystemrelease: '10.0',
       }
     end
 
@@ -66,12 +27,12 @@ describe 'firewall::linux::debian', type: :class do
     }
   end
 
-  context 'with deb8, alt operatingsystem, enable => false' do
+  context 'with Debian 10, enable => false' do
     let(:facts) do
       {
         osfamily: 'Debian',
         operatingsystem: 'Debian',
-        operatingsystemrelease: '8.0',
+        operatingsystemrelease: '10',
       }
     end
     let(:params) { { enable: 'false' } }
@@ -83,12 +44,12 @@ describe 'firewall::linux::debian', type: :class do
     }
   end
 
-  context 'with Debian 10' do
+  context 'with Debian 11' do
     let(:facts) do
       {
         osfamily: 'Debian',
         operatingsystem: 'Debian',
-        operatingsystemrelease: '10.0',
+        operatingsystemrelease: '11.0',
       }
     end
 
@@ -106,12 +67,12 @@ describe 'firewall::linux::debian', type: :class do
     }
   end
 
-  context 'with Debian 10, enable => false' do
+  context 'with Debian 11, enable => false' do
     let(:facts) do
       {
         osfamily: 'Debian',
         operatingsystem: 'Debian',
-        operatingsystemrelease: '10',
+        operatingsystemrelease: '11',
       }
     end
     let(:params) { { enable: 'false' } }

diff --git a/spec/unit/classes/firewall_linux_redhat_spec.rb b/spec/unit/classes/firewall_linux_redhat_spec.rb
index d274ac64fec278100d65c49d502c27f212e5fe82..d46b85e9bb813601502d624986284627d075e4ec 100644 (file)
--- a/spec/unit/classes/firewall_linux_redhat_spec.rb
+++ b/spec/unit/classes/firewall_linux_redhat_spec.rb
@@ -35,34 +35,10 @@ end
 
 describe 'firewall::linux::redhat', type: :class do
   ['RedHat', 'CentOS', 'Fedora', 'AlmaLinux'].each do |os|
-    oldreleases = ((os == 'Fedora') ? ['14'] : ['6.5'])
-    newreleases = ((os == 'Fedora') ? ['15', 'Rawhide'] : ['7.0.1406'])
+    releases = ((os == 'Fedora') ? ['36'] : ['7.0.1406'])
     nftablesreleases = ((os == 'Fedora') ? [] : ['8.0'])
 
-    oldreleases.each do |osrel|
-      context "os #{os} and osrel #{osrel}" do
-        let(:facts) do
-          {
-            operatingsystem: os,
-            operatingsystemrelease: osrel,
-            osfamily: 'RedHat',
-            selinux: false,
-            puppetversion: Puppet.version,
-          }
-        end
-
-        it { is_expected.not_to contain_service('firewalld') }
-        it { is_expected.not_to contain_package('iptables-services') }
-        it {
-          is_expected.to contain_file('/etc/sysconfig/iptables')
-          is_expected.to contain_file('/etc/sysconfig/ip6tables')
-        }
-
-        it_behaves_like 'ensures iptables service'
-      end
-    end
-
-    newreleases.each do |osrel|
+    releases.each do |osrel|
       context "os #{os} and osrel #{osrel}" do
         let(:facts) do
           {

diff --git a/spec/unit/classes/firewall_linux_spec.rb b/spec/unit/classes/firewall_linux_spec.rb
index 755de355261664f66c25719da7f52c657a2dccbc..34b88258595ee036e4ee95f7d1bf49abba8ee312 100644 (file)
--- a/spec/unit/classes/firewall_linux_spec.rb
+++ b/spec/unit/classes/firewall_linux_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 describe 'firewall::linux', type: :class do
   ['RedHat', 'CentOS'].each do |os|
     context "Redhat Like: operatingsystem => #{os}" do
-      releases = ['6', '7']
+      releases = ['6', '7', '8']
       releases.each do |osrel|
         context "operatingsystemrelease => #{osrel}" do
           let(:facts) do
@@ -28,7 +28,7 @@ describe 'firewall::linux', type: :class do
 
   ['Debian', 'Ubuntu'].each do |os|
     context "Debian Like: operatingsystem => #{os}" do
-      releases = ((os == 'Debian') ? ['10'] : ['20.04'])
+      releases = ((os == 'Debian') ? ['10', '11'] : ['20.04', '22.04'])
       releases.each do |osrel|
         let(:facts) do
           {

diff --git a/spec/unit/puppet/provider/ip6tables_spec.rb b/spec/unit/puppet/provider/ip6tables_spec.rb
index a991e46df601067b45ee5a33b2a0f2e7ea5e5f1b..cd4a7fea73df062eecc2a98481a5e1444249c6d2 100644 (file)
--- a/spec/unit/puppet/provider/ip6tables_spec.rb
+++ b/spec/unit/puppet/provider/ip6tables_spec.rb
@@ -2,11 +2,8 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-if Puppet::Util::Package.versioncmp(Puppet.version, '3.4.0') < 0
-  require 'puppet/provider/confine/exists'
-else
-  require 'puppet/confine/exists'
-end
+require 'puppet/confine/exists'
+
 provider_class = Puppet::Type.type(:firewall).provider(:ip6tables)
 describe 'ip6tables' do
   let(:params) { { name: '000 test foo', action: 'accept' } }

diff --git a/spec/unit/puppet/provider/iptables_chain_spec.rb b/spec/unit/puppet/provider/iptables_chain_spec.rb
index f7ccb9f691119b20a2bef23874d86446dd499bc3..f1a891f6e322be57d162bda6c9f18f335be4e0e6 100755 (executable)
--- a/spec/unit/puppet/provider/iptables_chain_spec.rb
+++ b/spec/unit/puppet/provider/iptables_chain_spec.rb
@@ -2,22 +2,12 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-if Puppet::Util::Package.versioncmp(Puppet.version, '3.4.0') < 0
-  require 'puppet/provider/confine/exists'
-else
-  require 'puppet/confine/exists'
-end
+require 'puppet/confine/exists'
 
 describe 'iptables chain' do
   describe 'iptables chain provider detection' do
-    if Puppet::Util::Package.versioncmp(Puppet.version, '3.4.0') < 0
-      let(:exists) do
-        Puppet::Provider::Confine::Exists
-      end
-    else
-      let(:exists) do
-        Puppet::Confine::Exists
-      end
+    let(:exists) do
+      Puppet::Confine::Exists
     end
 
     before :each do

diff --git a/spec/unit/puppet/provider/iptables_spec.rb b/spec/unit/puppet/provider/iptables_spec.rb
index 918cf64d806b22f8d0b6761a8086efb3e0dc3660..2064d58eb4033e36c56cc2308019e5c901f474fa 100644 (file)
--- a/spec/unit/puppet/provider/iptables_spec.rb
+++ b/spec/unit/puppet/provider/iptables_spec.rb
@@ -2,21 +2,12 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-if Puppet::Util::Package.versioncmp(Puppet.version, '3.4.0') < 0
-  require 'puppet/provider/confine/exists'
-else
-  require 'puppet/confine/exists'
-end
+require 'puppet/confine/exists'
 
 describe 'iptables provider detection' do # rubocop:disable RSpec/MultipleDescribes
-  if Puppet::Util::Package.versioncmp(Puppet.version, '3.4.0') < 0
-    let(:exists) do
-      Puppet::Provider::Confine::Exists
-    end
-  else
-    let(:exists) do
-      Puppet::Confine::Exists
-    end
+  
+  let(:exists) do
+    Puppet::Confine::Exists
   end
 
   before :each do