(FM-7789) - PostgreSQL Test Cleanup

Author: david22swan

.sync.yml

@@ -1,4 +1,7 @@
 ---
+.gitlab-ci.yml:
+  unmanaged: true
+
 .travis.yml:
   docker_sets:
     - set: docker/centos-7
@@ -9,6 +12,9 @@
   branches:
     - release
 
+appveyor.yml:
+  delete: true
+
 Gemfile:
   required:
     ':system_tests':
@@ -29,8 +35,6 @@ Gemfile:
 Rakefile:
   changelog_user: puppetlabs
 
-appveyor.yml:
-  delete: true
-
-.gitlab-ci.yml:
-  unmanaged: true
+spec/spec_helper.rb:
+  mock_with: ':rspec'
+  coverage_report: true

lib/puppet/provider/postgresql_psql/ruby.rb

@@ -55,23 +55,12 @@ def get_environment # rubocop:disable Style/AccessorMethodName : Refactor does n
 
   def run_command(command, user, group, environment)
     command = command.join ' '
-    if Puppet::PUPPETVERSION.to_f < 3.0
-      require 'puppet/util/execution'
-      Puppet::Util::Execution.withenv environment do
-        Puppet::Util::SUIDManager.run_and_capture(command, user, group)
-      end
-    elsif Puppet::PUPPETVERSION.to_f < 3.4
-      Puppet::Util.withenv environment do
-        Puppet::Util::SUIDManager.run_and_capture(command, user, group)
-      end
-    else
-      output = Puppet::Util::Execution.execute(command, uid: user,
-                                                        gid: group,
-                                                        failonfail: false,
-                                                        combine: true,
-                                                        override_locale: true,
-                                                        custom_environment: environment)
-      [output, $CHILD_STATUS.dup]
-    end
+    output = Puppet::Util::Execution.execute(command, uid: user,
+                                                      gid: group,
+                                                      failonfail: false,
+                                                      combine: true,
+                                                      override_locale: true,
+                                                      custom_environment: environment)
+    [output, $CHILD_STATUS.dup]
   end
 end

lib/puppet/provider/postgresql_replication_slot/ruby.rb

@@ -44,16 +44,12 @@ def self.run_sql_command(sql)
   end
 
   def self.run_command(command, user, group)
-    if Puppet::PUPPETVERSION.to_f < 3.4
-      Puppet::Util::SUIDManager.run_and_capture(command, user, group)
-    else
-      output = Puppet::Util::Execution.execute(command, uid: user,
-                                                        gid: group,
-                                                        failonfail: false,
-                                                        combine: true,
-                                                        override_locale: true,
-                                                        custom_environment: {})
-      [output, $CHILD_STATUS.dup]
-    end
+    output = Puppet::Util::Execution.execute(command, uid: user,
+                                                      gid: group,
+                                                      failonfail: false,
+                                                      combine: true,
+                                                      override_locale: true,
+                                                      custom_environment: {})
+    [output, $CHILD_STATUS.dup]
   end
 end

metadata.json

@@ -84,5 +84,5 @@
   ],
   "pdk-version": "1.9.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates/",
-  "template-ref": "1.9.0-0-g7281db5"
-}
+  "template-ref": "heads/master-0-g615413e"
+}

spec/acceptance/00-utf8_encoding_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper_acceptance' # rubocop:disable Style/FileName
 
-# 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
   pp = <<-MANIFEST
       class { 'postgresql::globals':
@@ -11,8 +9,7 @@ class { 'postgresql::globals':
       class { 'postgresql::server': }
   MANIFEST
   it 'with defaults' do
-    apply_manifest(pp, catch_failures: true)
-    apply_manifest(pp, catch_changes: true)
+    idempotent_apply(default, pp)
   end
 
   describe port(5432) do

spec/acceptance/alternative_port_spec.rb

@@ -8,8 +8,7 @@
       class { 'postgresql::server': port => '55433' }
     MANIFEST
 
-    apply_manifest(pp, catch_failures: true)
-    apply_manifest(pp, catch_changes: true)
+    idempotent_apply(default, pp)
   end
 
   describe port(55433) do # rubocop:disable Style/NumericLiterals

spec/acceptance/db_spec.rb

@@ -20,8 +20,7 @@ class { 'postgresql::server':
         }
       MANIFEST
 
-      apply_manifest(pp, catch_failures: true)
-      apply_manifest(pp, catch_changes: true)
+      idempotent_apply(default, pp)
 
       # Verify that the postgres password works
       shell("echo 'localhost:*:*:postgres:\'space password\'' > /root/.pgpass")

spec/acceptance/default_parameters_spec.rb

@@ -8,8 +8,7 @@
       class { 'postgresql::server': }
     MANIFEST
 
-    apply_manifest(pp, catch_failures: true)
-    apply_manifest(pp, catch_changes: true)
+    idempotent_apply(default, pp)
   end
 
   describe port(5432) do

spec/acceptance/overridden_settings_spec.rb

@@ -31,8 +31,7 @@ class { 'postgresql::server':
   MANIFEST
 
   it 'with additional hiera entries' do
-    apply_manifest(pp, catch_failures: true)
-    apply_manifest(pp, catch_changes: true)
+    idempotent_apply(default, pp)
   end
 
   describe port(5432) do

spec/acceptance/postgresql_conn_validator_spec.rb

@@ -34,8 +34,7 @@ class { 'postgresql::server':
         }
       MANIFEST
 
-      apply_manifest(pp, catch_failures: true)
-      apply_manifest(pp, catch_changes: true)
+      idempotent_apply(default, pp)
     end
 
     it 'works with connect settings hash' do
@@ -53,8 +52,7 @@ class { 'postgresql::server':
         }
       MANIFEST
 
-      apply_manifest(pp, catch_failures: true)
-      apply_manifest(pp, catch_changes: true)
+      idempotent_apply(default, pp)
     end
 
     it 'fails gracefully' do