(FM-7789) - ServerSpec Test Facts Implemented

Author: david22swan

spec/acceptance/00-utf8_encoding_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance' # rubocop:disable Style/FileName
 
-describe 'postgresql::server', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'postgresql::server', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   pp = <<-MANIFEST
       class { 'postgresql::globals':
         encoding => 'UTF8',

spec/acceptance/alternative_port_spec.rb

@@ -2,7 +2,7 @@
 
 # These tests ensure that postgres can change itself to an alternative port
 # properly.
-describe 'postgresql::server', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'postgresql::server', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   it 'on an alternative port' do
     pp = <<-MANIFEST
       class { 'postgresql::server': port => '55433' }

spec/acceptance/db_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'postgresql::server::db', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'postgresql::server::db', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   # rubocop:disable Metrics/LineLength
   it 'creates a database' do
     begin

spec/acceptance/default_parameters_spec.rb

@@ -2,7 +2,7 @@
 
 # These tests are designed to ensure that the module, when ran with defaults,
 # sets up everything correctly and allows us to connect to Postgres.
-describe 'postgresql::server', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'postgresql::server', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   it 'with defaults' do
     pp = <<-MANIFEST
       class { 'postgresql::server': }

spec/acceptance/overridden_settings_spec.rb

@@ -2,7 +2,7 @@
 
 # These tests are designed to ensure that the module, when ran overrides,
 # sets up everything correctly and allows us to connect to Postgres.
-describe 'postgresql::server', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'postgresql::server', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   pp = <<-MANIFEST
     class { 'postgresql::server':
       roles          => {

spec/acceptance/postgresql_conn_validator_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'postgresql_conn_validator', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'postgresql_conn_validator', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   let(:install_pp) do
     <<-MANIFEST
       class { 'postgresql::server':

spec/acceptance/postgresql_psql_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'postgresql_psql', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'postgresql_psql', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   pp_one = <<-MANIFEST
     class { 'postgresql::server': } ->
     postgresql_psql { 'foobar':

spec/acceptance/server/grant_role_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper_acceptance'
 
-describe 'postgresql::server::grant_role:', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'postgresql::server::grant_role:', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   let(:db) { 'grant_role_test' }
   let(:user) { 'psql_grant_role_tester' }
   let(:group) { 'test_group' }
   let(:password) { 'psql_grant_role_pw' }
   let(:version) do
-    if fact('osfamily') == 'RedHat' && fact('operatingsystemrelease') =~ %r{5}
+    if os[:family] == 'redhat' && os[:release].start_with?('5')
       '8.1'
     end
   end

spec/acceptance/server/grant_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'postgresql::server::grant:', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'postgresql::server::grant:', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   let(:version) do
     result = shell('psql --version')
     result.stdout.match(%r{\s(\d{1,2}\.\d)})[1]

spec/acceptance/server/reassign_owned_by_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'postgresql::server::reassign_owned_by:', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'postgresql::server::reassign_owned_by:', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   let(:version) do
     result = shell('psql --version')
     result.stdout.match(%r{\s(\d{1,2}\.\d)})[1]

spec/acceptance/server/recovery_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'postgresql::server::recovery', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'postgresql::server::recovery', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   describe 'should manage recovery' do
     after(:all) do
       pp = <<-MANIFEST.unindent

spec/acceptance/server/schema_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper_acceptance'
 
-describe 'postgresql::server::schema:', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'postgresql::server::schema:', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   let(:version) do
-    if fact('osfamily') == 'RedHat' && fact('operatingsystemrelease') =~ %r{5}
+    if os[:family] == 'redhat' && os[:release].start_with?('5')
       '8.1'
     end
   end

spec/acceptance/z_alternative_pgdata_spec.rb

@@ -4,13 +4,13 @@
 # location properly.
 
 # Allow postgresql to use /tmp/* as a datadir
-if fact('osfamily') == 'RedHat' && fact('selinux') == 'true'
+if os[:family] == 'redhat' && fact('selinux') == 'true'
   shell 'setenforce 0'
 end
 
-describe 'postgresql::server', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'postgresql::server', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   before(:each) do
-    if fact('osfamily') == 'Suse'
+    if os[:family] == 'sles'
       skip "These test's currently do not work on SLES/Suse modules"
     end
   end

spec/spec_helper_acceptance.rb

@@ -11,7 +11,7 @@
 configure_type_defaults_on(hosts)
 install_ca_certs unless pe_install?
 
-UNSUPPORTED_PLATFORMS = ['AIX', 'windows', 'Solaris'].freeze
+UNSUPPORTED_PLATFORMS = ['aix', 'windows', 'solaris'].freeze
 
 install_bolt_on(hosts) unless pe_install?
 install_module_on(hosts)
@@ -78,7 +78,7 @@ def idempotent_apply(hosts, manifest, opts = {}, &block)
   c.before :suite do
     run_puppet_access_login(user: 'admin') if pe_install? && (Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0'))
     # Set up selinux if appropriate.
-    if fact('osfamily') == 'RedHat' && fact('selinux') == 'true'
+    if os[:family] == 'redhat' && fact('selinux') == 'true'
       pp = <<-EOS
         if $::osfamily == 'RedHat' and $::selinux == 'true' {
           $semanage_package = $::operatingsystemmajrelease ? {
@@ -99,9 +99,8 @@ def idempotent_apply(hosts, manifest, opts = {}, &block)
     end
 
     # net-tools required for netstat utility being used by be_listening
-    if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7' ||
-       fact('osfamily') == 'Debian' && (fact('operatingsystemmajrelease') == '9' ||
-                                        fact('operatingsystemmajrelease') == '18.04')
+    if os[:family] == 'redhat' && os[:release].start_with?('7') ||
+       os[:family] == 'debian' && os[:release].start_with?('9', '18.04')
       pp = <<-EOS
         package { 'net-tools': ensure => installed }
       EOS