Merge pull request puppetlabs#966 from david22swan/ensure_fix

(maint) Fix to grant_spec.rb regarding database test on earlier machines

Author: pmcmaw

README.md

@@ -1154,7 +1154,7 @@ Manages grant-based access privileges for users, wrapping the `postgresql::serve
 
 ##### `ensure`
 
-Specifies whether to grant or revoke the privilege. Default is to grant the privilege.
+Specifies whether to grant or revoke the privilege. Revoke or 'absent' works only in PostgreSQL version 9.1.24 or later.
 
 Valid values: 'present', 'absent'.
 * 'present' to grant the privilege

spec/acceptance/server/grant_spec.rb

@@ -500,18 +500,25 @@ class { 'postgresql::server': }
     describe 'REVOKE ... ON DATABASE...' do
       it 'do not fail on revoke connect from non-existant user' do
         begin
-          apply_manifest(pp_setup, catch_failures: true)
-          pp = pp_setup + <<-EOS.unindent
-            postgresql::server::grant { 'revoke connect on db from norole':
-              ensure      => absent,
-              privilege   => 'CONNECT',
-              object_type => 'DATABASE',
-              db          => '#{db}',
-              role        => '#{user}_does_not_exist',
-            }
-          EOS
-          apply_manifest(pp, catch_changes: true)
-          apply_manifest(pp, catch_failures: true)
+          # Test fail's on postgresql versions earlier than 9.1.24
+          # postgres version
+          result = shell('psql --version')
+          version = result.stdout.match(%r{\s(\d\.\d)})[1]
+
+          if version >= '9.1.24'
+            apply_manifest(pp_setup, catch_failures: true)
+            pp = pp_setup + <<-EOS.unindent
+              postgresql::server::grant { 'revoke connect on db from norole':
+                ensure      => absent,
+                privilege   => 'CONNECT',
+                object_type => 'DATABASE',
+                db          => '#{db}',
+                role        => '#{user}_does_not_exist',
+              }
+            EOS
+            apply_manifest(pp, catch_changes: true)
+            apply_manifest(pp, catch_failures: true)
+          end
         end
       end
     end