(CONT-189) Remove RHEL 6 from Spec tests

david22swan · david22swan · commit b7dc6da81fbf · 2022-10-07T11:49:43.000+01:00
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
@@ -725,7 +725,7 @@
     }
   end
   context 'on all OSes' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     context 'with a custom apache_name parameter' do
       let :params do
diff --git a/spec/classes/mod/alias_spec.rb b/spec/classes/mod/alias_spec.rb
@@ -12,12 +12,6 @@
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/apache2\/icons\/"}) }
     end
-    context 'on a RedHat 6-based OS', :compile do
-      include_examples 'RedHat 6'
-
-      it { is_expected.to contain_apache__mod('alias') }
-      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/var\/www\/icons\/"}) }
-    end
     context 'on a RedHat 7-based OS', :compile do
       include_examples 'RedHat 7'
 
diff --git a/spec/classes/mod/auth_cas_spec.rb b/spec/classes/mod/auth_cas_spec.rb
@@ -38,7 +38,7 @@
       it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASIdleTimeout 4321}) }
     end
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::authn_core') }
@@ -55,7 +55,7 @@
         "class { 'apache': } apache::vhost { 'test.server': docroot => '/var/www/html', cas_root_proxied_as => 'http://test.server', cas_cookie_path => '/my/cas/path'} "
       end
 
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::authn_core') }
diff --git a/spec/classes/mod/auth_gssapi_spec.rb b/spec/classes/mod/auth_gssapi_spec.rb
@@ -15,7 +15,7 @@
       it { is_expected.to contain_package('libapache2-mod-auth-gssapi') }
     end
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::authn_core') }
diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
@@ -15,7 +15,7 @@
       it { is_expected.to contain_package('libapache2-mod-auth-kerb') }
     end
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::authn_core') }
@@ -41,7 +41,7 @@
   end
   context 'overriding mod_packages' do
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
       let :pre_condition do
         <<-MANIFEST
         include apache::params
diff --git a/spec/classes/mod/auth_mellon_spec.rb b/spec/classes/mod/auth_mellon_spec.rb
@@ -36,7 +36,7 @@
     end
   end
   context 'default configuration with parameters on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     describe 'with no parameters' do
       it { is_expected.to contain_class('apache::mod::authn_core') }
diff --git a/spec/classes/mod/auth_openidc_spec.rb b/spec/classes/mod/auth_openidc_spec.rb
@@ -50,7 +50,7 @@
   end
   context 'overriding mod_packages' do
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
       let :pre_condition do
         <<-MANIFEST
         include apache::params
diff --git a/spec/classes/mod/authn_dbd_spec.rb b/spec/classes/mod/authn_dbd_spec.rb
@@ -32,7 +32,7 @@
     end
 
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('authn_dbd') }
diff --git a/spec/classes/mod/cluster_spec.rb b/spec/classes/mod/cluster_spec.rb
@@ -48,27 +48,4 @@
 
     it { is_expected.to contain_file('cluster.conf') }
   end
-
-  context 'on a RedHat OS Release 6 with mod version < 1.3.0' do
-    include_examples 'RedHat 6'
-
-    let(:params) do
-      {
-        allowed_network: '172.17.0',
-        balancer_name: 'mycluster',
-        ip: '172.17.0.1',
-        version: '1.2.0',
-      }
-    end
-
-    it { is_expected.to contain_class('apache') }
-    it { is_expected.to contain_apache__mod('proxy') }
-    it { is_expected.to contain_apache__mod('proxy_ajp') }
-    it { is_expected.to contain_apache__mod('manager') }
-    it { is_expected.to contain_apache__mod('proxy_cluster') }
-    it { is_expected.to contain_apache__mod('advertise') }
-    it { is_expected.to contain_apache__mod('slotmem') }
-
-    it { is_expected.to contain_file('cluster.conf') }
-  end
 end
diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
@@ -28,7 +28,7 @@
       end
     end
     context 'on a RedHat OS' do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dav_svn') }
diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
@@ -53,7 +53,7 @@ def general_deflate_specs
     end
 
     context 'on a RedHat OS with default params' do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       # Load the more generic tests for this context
       general_deflate_specs
diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
@@ -11,7 +11,7 @@
 
   it_behaves_like 'a mod class, without including apache'
 
-  ['RedHat 6', 'Debian 11', 'FreeBSD 9'].each do |os|
+  ['RedHat 8', 'Debian 11', 'FreeBSD 9'].each do |os|
     context "on a #{os} OS" do
       include_examples os
 
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'apache::mod::dir', type: :class do
-  ['Debian 11', 'RedHat 6', 'FreeBSD 9', 'Gentoo'].each do |os|
+  ['Debian 11', 'RedHat 8', 'FreeBSD 9', 'Gentoo'].each do |os|
     context "default configuration with parameters on #{os}" do
       include_examples os
 
diff --git a/spec/classes/mod/disk_cache_spec.rb b/spec/classes/mod/disk_cache_spec.rb
@@ -102,8 +102,8 @@
     end
   end
 
-  context 'on a RedHat 6-based OS' do
-    include_examples 'RedHat 6'
+  context 'on a RedHat 8-based OS' do
+    include_examples 'RedHat 8'
 
     let(:params) do
       {
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
@@ -147,7 +147,7 @@
     end
   end
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     context 'with Apache version >= 2.4' do
       let :params do
diff --git a/spec/classes/mod/ext_filter_spec.rb b/spec/classes/mod/ext_filter_spec.rb
@@ -22,7 +22,7 @@
     end
   end
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     describe 'with no parameters' do
       it { is_expected.to contain_apache__mod('ext_filter') }
diff --git a/spec/classes/mod/fcgid_spec.rb b/spec/classes/mod/fcgid_spec.rb
@@ -15,44 +15,6 @@
     it { is_expected.to contain_package('libapache2-mod-fcgid') }
   end
 
-  context 'on a RHEL6' do
-    include_examples 'RedHat 6'
-
-    describe 'without parameters' do
-      it { is_expected.to contain_class('apache::params') }
-      it {
-        is_expected.to contain_apache__mod('fcgid').with('loadfile_name' => nil)
-      }
-      it { is_expected.to contain_package('mod_fcgid') }
-    end
-
-    describe 'with parameters' do
-      let :params do
-        {
-          options: {
-            'FcgidIPCDir'               => '/var/run/fcgidsock',
-            'SharememPath'              => '/var/run/fcgid_shm',
-            'FcgidMinProcessesPerClass' => '0',
-            'AddHandler'                => 'fcgid-script .fcgi',
-          },
-        }
-      end
-
-      expected = [
-        '<IfModule mod_fcgid.c>',
-        '  AddHandler fcgid-script .fcgi',
-        '  FcgidIPCDir /var/run/fcgidsock',
-        '  FcgidMinProcessesPerClass 0',
-        '  SharememPath /var/run/fcgid_shm',
-        '</IfModule>',
-      ]
-      it 'contains the correct config' do
-        content = catalogue.resource('file', 'fcgid.conf').send(:parameters)[:content]
-        expect(content.split("\n").reject { |c| c =~ %r{(^#|^$)} }).to eq(expected)
-      end
-    end
-  end
-
   context 'on RHEL7' do
     include_examples 'RedHat 7'
 
diff --git a/spec/classes/mod/info_spec.rb b/spec/classes/mod/info_spec.rb
@@ -140,7 +140,7 @@ def general_info_specs_apache24
   end
 
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     # Load the more generic tests for this context
     general_info_specs_apache22
diff --git a/spec/classes/mod/intercept_form_submit_spec.rb b/spec/classes/mod/intercept_form_submit_spec.rb
@@ -15,7 +15,7 @@
     end # Debian
 
     context 'on a RedHat OS' do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('mod_intercept_form_submit') }
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
@@ -70,7 +70,7 @@
   end
 
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('itk') }
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
@@ -90,8 +90,8 @@
     end
   end
 
-  context 'RHEL 6' do
-    include_examples 'RedHat 6'
+  context 'RHEL 8' do
+    include_examples 'RedHat 8'
     let(:pre_condition) do
       'include apache'
     end
diff --git a/spec/classes/mod/ldap_spec.rb b/spec/classes/mod/ldap_spec.rb
@@ -55,7 +55,7 @@
   end # Debian
 
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_class('apache::mod::ldap') }
diff --git a/spec/classes/mod/lookup_identity.rb b/spec/classes/mod/lookup_identity.rb
@@ -15,7 +15,7 @@
     end # Debian
 
     context 'on a RedHat OS' do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('mod_lookup_identity') }
diff --git a/spec/classes/mod/mime_magic_spec.rb b/spec/classes/mod/mime_magic_spec.rb
@@ -44,7 +44,7 @@ def general_mime_magic_specs
   end
 
   context 'on a RedHat OS with default params' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     general_mime_magic_specs
 
diff --git a/spec/classes/mod/mime_spec.rb b/spec/classes/mod/mime_spec.rb
@@ -26,7 +26,7 @@ def general_mime_specs
   end
 
   context 'on a RedHat OS with default params', :compile do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     general_mime_specs
 
diff --git a/spec/classes/mod/pagespeed_spec.rb b/spec/classes/mod/pagespeed_spec.rb
@@ -28,7 +28,7 @@
   end
 
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('pagespeed') }
diff --git a/spec/classes/mod/perl_spec.rb b/spec/classes/mod/perl_spec.rb
@@ -12,7 +12,7 @@
     it { is_expected.to contain_package('libapache2-mod-perl2') }
   end
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('perl') }
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
@@ -43,7 +43,7 @@
     end
   end
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.not_to contain_apache__mod('prefork') }
diff --git a/spec/classes/mod/proxy_balancer_spec.rb b/spec/classes/mod/proxy_balancer_spec.rb
@@ -33,7 +33,7 @@ def balancer_manager_conf_spec(allow_from, manager_path)
     end
 
     context 'on a RedHat OS' do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_apache__mod('proxy_balancer') }
 
diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
@@ -33,7 +33,7 @@
   end
 
   context 'on a RedHat OS', :compile do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('proxy_html').with(loadfiles: nil) }
diff --git a/spec/classes/mod/python_spec.rb b/spec/classes/mod/python_spec.rb
@@ -13,7 +13,7 @@
     it { is_expected.to contain_package('libapache2-mod-python') }
   end
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_apache__mod('python') }
diff --git a/spec/classes/mod/reqtimeout_spec.rb b/spec/classes/mod/reqtimeout_spec.rb
@@ -32,7 +32,7 @@
     end
   end
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     context 'passing no parameters' do
       it { is_expected.to contain_class('apache::params') }
diff --git a/spec/classes/mod/shib_spec.rb b/spec/classes/mod/shib_spec.rb
@@ -12,7 +12,7 @@
     end
   end
   context 'on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     describe 'with no parameters' do
       it { is_expected.to contain_apache__mod('shib2').with_id('mod_shib') }
diff --git a/spec/classes/mod/spec_helper_local.rb b/spec/classes/mod/spec_helper_local.rb
diff --git a/spec/classes/mod/speling_spec.rb b/spec/classes/mod/speling_spec.rb
diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
diff --git a/spec/classes/mod/status_spec.rb b/spec/classes/mod/status_spec.rb
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
diff --git a/spec/classes/vhosts_spec.rb b/spec/classes/vhosts_spec.rb
diff --git a/spec/defines/mod_spec.rb b/spec/defines/mod_spec.rb
diff --git a/spec/defines/vhost_custom_spec.rb b/spec/defines/vhost_custom_spec.rb
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb

Original file line number	Diff line number	Diff line change
`@@ -725,7 +725,7 @@`
`725`	`725`	`}`
`726`	`726`	`end`
`727`	`727`	`context 'on all OSes' do`
`728`		`- include_examples 'RedHat 6'`
	`728`	`+ include_examples 'RedHat 8'`
`729`	`729`
`730`	`730`	`context 'with a custom apache_name parameter' do`
`731`	`731`	`let :params do`