Merge pull request #427 from apenney/fix-1404-tests

Fix Ubuntu 14.04 tests for now.

manifests/server.pp

@@ -51,8 +51,11 @@ class postgresql::server (
 ) inherits postgresql::params {
   $pg = 'postgresql::server'
 
-  if $version != $postgresql::params::version {
+  if $version != undef {
     warning('Passing "version" to postgresql::server is deprecated; please use postgresql::globals instead.')
+    $_version = $postgresql::params::version
+  } else {
+    $_version = $version
   }
 
   if ($ensure == 'present' or $ensure == true) {

manifests/server/install.pp

@@ -23,7 +23,7 @@ class postgresql::server::install {
 
     # This will clean up anything we miss
     exec { 'apt-get-autoremove-postgresql-client-brute':
-      command   => "dpkg -P postgresql*",
+      command   => 'dpkg -P postgresql*',
       onlyif    => "dpkg -l postgresql* | grep -e '^ii'",
       logoutput => on_failure,
       path      => '/usr/bin:/bin:/usr/sbin/:/sbin',

spec/acceptance/server_spec.rb

@@ -167,7 +167,7 @@ describe 'server without defaults:', :unless => UNSUPPORTED_PLATFORMS.include?(f
         version => '9.3',
       }
       EOS
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to match(/Passing "version" to postgresql::server is deprecated/i)
+      expect(apply_manifest(pp, :catch_failures => false).stderr).to match(/Passing "version" to postgresql::server is deprecated/i)
     end
   end