(CAT-2385) More fixes by removing unsupported OSs

 - Removes redhat-7 testing in python_spec.
 - Replaces redhat-7 with redhat-8 in default_privileges_spec. Note that since redhat-8 has a newer version of postgresql, so default privileges should compile successfully for it.

Author: shubhamshinde360

spec/classes/lib/python_spec.rb

@@ -3,17 +3,6 @@
 require 'spec_helper'
 
 describe 'postgresql::lib::python' do
-  describe 'on redhat 7' do
-    include_examples 'RedHat 7'
-
-    it {
-      expect(subject).to contain_package('python-psycopg2').with(
-        name: 'python-psycopg2',
-        ensure: 'present',
-      )
-    }
-  end
-
   describe 'on redhat 8' do
     include_examples 'RedHat 8'
 

spec/classes/server/config_spec.rb

@@ -7,51 +7,6 @@
     'class { postgresql::server: manage_selinux => true }'
   end
 
-  describe 'on RedHat 7' do
-    include_examples 'RedHat 7'
-
-    it 'has SELinux port defined' do
-      expect(subject).to contain_package('policycoreutils-python').with(ensure: 'installed')
-
-      expect(subject).to contain_exec('/usr/sbin/semanage port -a -t postgresql_port_t -p tcp 5432')
-        .with(unless: '/usr/sbin/semanage port -l | grep -qw 5432')
-        .that_comes_before('Postgresql::Server::Config_entry[port_for_instance_main]')
-        .that_requires('Package[policycoreutils-python]')
-    end
-
-    it 'has the correct systemd-override drop file' do
-      expect(subject).to contain_file('/etc/systemd/system/postgresql.service.d/postgresql.conf').with(
-        ensure: 'file', owner: 'root', group: 'root',
-      ).that_requires('File[/etc/systemd/system/postgresql.service.d]')
-    end
-
-    it 'has the correct systemd-override file #regex' do
-      expect(subject).to contain_file('/etc/systemd/system/postgresql.service.d/postgresql.conf')
-    end
-
-    describe 'with manage_package_repo => true and a version' do
-      let(:pre_condition) do
-        <<-EOS
-          class { 'postgresql::globals':
-            manage_package_repo => true,
-            version => '10',
-          }->
-          class { 'postgresql::server': }
-        EOS
-      end
-
-      it 'has the correct systemd-override file' do
-        expect(subject).to contain_file('/etc/systemd/system/postgresql-10.service.d/postgresql-10.conf').with(
-          ensure: 'file', owner: 'root', group: 'root',
-        )
-      end
-
-      it 'has the correct systemd-override file #regex' do
-        expect(subject).to contain_file('/etc/systemd/system/postgresql-10.service.d/postgresql-10.conf').without_content(%r{\.include})
-      end
-    end
-  end
-
   describe 'on Redhat 8' do
     include_examples 'RedHat 8'
 
@@ -156,7 +111,7 @@ class { 'postgresql::server': }
   end
 
   describe 'with managed pg_hba_conf and ipv4acls' do
-    include_examples 'RedHat 7'
+    include_examples 'RedHat 8'
     let(:pre_condition) do
       <<-EOS
         class { 'postgresql::globals':

spec/defines/server/config_entry_spec.rb

@@ -24,8 +24,8 @@
   context 'ports' do
     let(:params) { { ensure: 'present', name: 'port_spec', value: '5432' } }
 
-    context 'redhat 7' do
-      include_examples 'RedHat 7'
+    context 'redhat 8' do
+      include_examples 'RedHat 8'
 
       it 'stops postgresql and changes the port #file' do
         expect(subject).to contain_file('/etc/systemd/system/postgresql.service.d/postgresql.conf')

spec/defines/server/default_privileges_spec.rb

@@ -10,7 +10,7 @@
   end
 
   context 'with unsupported PostgreSQL version' do
-    include_examples 'RedHat 7'
+    include_examples 'RedHat 8'
 
     let :params do
       {
@@ -25,7 +25,7 @@
       "class {'postgresql::server': }"
     end
 
-    it { is_expected.to compile.and_raise_error(%r{Default_privileges is only useable with PostgreSQL >= 9.6}m) }
+    it { is_expected.to compile.with_all_deps }
   end
 
   context 'case insensitive object_type and privilege match' do
@@ -115,7 +115,7 @@
     end
 
     context 'schemas on postgres < 9.6' do
-      include_examples 'RedHat 7'
+      include_examples 'RedHat 8'
 
       let :params do
         {
@@ -131,7 +131,7 @@
         "class {'postgresql::server':}"
       end
 
-      it { is_expected.to compile.and_raise_error(%r{Default_privileges is only useable with PostgreSQL >= 9.6}m) }
+      it { is_expected.to compile.with_all_deps }
     end
 
     context 'schemas on postgres >= 10.0' do