A few minor fixes to get tests passing again

manifests/devel.pp

@@ -17,8 +17,6 @@ class postgresql::devel(
   $package_ensure = 'present'
 ) {
 
-  require postgresql
-
   if ! $package_name {
     include postgresql::platform
     $package_name_real = $postgresql::platform::devel_package_name

manifests/init.pp

@@ -21,7 +21,6 @@ class postgresql (
   $package_ensure = 'present'
 ) inherits postgresql::params {
 
-
   if ! $package_name {
     include postgresql::platform
     $package_name_real = $postgresql::platform::client_package_name

manifests/platform.pp

@@ -13,9 +13,9 @@
 # Sample Usage:
 #
 class postgresql::platform {
-  include postgresql
-  
-  $version = $postgresql::version
+
+  #$version = $postgresql::version
+  $version = $::postgres_default_version
 
   case $::operatingsystem {
     default: {
@@ -44,6 +44,8 @@ class postgresql::platform {
         $datadir      = "/var/lib/pgsql/${version}/data"
         $confdir      = $datadir
       }
+
+      $service_status = undef
     }
 
     'Debian': {

manifests/server.pp

@@ -23,7 +23,6 @@ class postgresql::server (
   $config_hash      = {}
 ) inherits postgresql::params {
 
-  require postgresql
   include postgresql::platform
 
   if ! $package_name {
@@ -69,7 +68,7 @@ class postgresql::server (
     provider => $service_provider_real,
     status   => $service_status_real,
   }
-  
+
   if ($postgresql::params::needs_initdb) {
     include postgresql::initdb
 
@@ -81,7 +80,11 @@ class postgresql::server (
 
   exec { 'reload_postgresql':
     path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-    command     => "service ${postgresql::params::service_name} reload",
+    command     => "service ${service_name_real} reload",
+    user        => $postgresql::params::user,
+    group       => $postgresql::params::group,
+    onlyif      => $service_status_real,
     refreshonly => true,
   }
+
 }

spec/support/shared_examples/system_default_postgres.rb

@@ -7,7 +7,7 @@ shared_examples :system_default_postgres do
 
   # this method is required by the pg_vm shared context
   def install_postgres
-    sudo_and_log(vm, 'puppet apply -e "include postgresql::server"')
+    sudo_and_log(vm, 'puppet apply --debug -e "include postgresql::server"')
   end
 
   describe 'postgresql::initdb' do