From 29d7e224718189afec1611437da18b9a411cd26f Mon Sep 17 00:00:00 2001 From: Lukas Audzevicius Date: Thu, 3 Nov 2022 14:12:59 +0000 Subject: [PATCH] Remove/Adjust Spec test cases --- .../classes/firewall_linux_debian_spec.rb | 55 +++---------------- .../classes/firewall_linux_redhat_spec.rb | 28 +--------- spec/unit/classes/firewall_linux_spec.rb | 4 +- spec/unit/puppet/provider/ip6tables_spec.rb | 7 +-- .../puppet/provider/iptables_chain_spec.rb | 16 +----- spec/unit/puppet/provider/iptables_spec.rb | 17 ++---- 6 files changed, 21 insertions(+), 106 deletions(-) diff --git a/spec/unit/classes/firewall_linux_debian_spec.rb b/spec/unit/classes/firewall_linux_debian_spec.rb index 7383351..f807c0a 100644 --- 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 d274ac6..d46b85e 100644 --- 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 755de35..34b8825 100644 --- 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 a991e46..cd4a7fe 100644 --- 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 f7ccb9f..f1a891f 100755 --- 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 918cf64..2064d58 100644 --- 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 -- 2.45.2