RSpec tests were fixed to work properly with included postgresql_puppet_extras.conf

Author: kbrezina

spec/support/shared_examples/system_default_postgres.rb

@@ -161,8 +161,10 @@ def install_postgres
       # Run again to check for idempotence
       sudo_and_log(vm, "puppet apply --detailed-exitcodes -e '#{test_class}'")
 
+      sudo_and_log(vm, "service #{service_name} restart")
+
       # Check that the user can create a table in the database
-      sudo_psql_and_log(vm, '--command="show max_connections" -t', 'postgres', ' |grep "1234"')
+      sudo_psql_and_log(vm, '--command="show max_connections" -t', 'postgres', ' |grep "123"')
 
       cleanup_class = 'class {"postgresql_tests::system_default::test_pgconf_include_cleanup": }'
       sudo_and_log(vm, "puppet apply -e '#{cleanup_class}'")

spec/test_module/manifests/system_default/test_pgconf_include.pp

@@ -2,10 +2,9 @@
 
   require postgresql::params
 
-  $pg_conf_include_file = "${postgresql::params::confdir}/postgresql_conf_extras.conf"
+  $pg_conf_include_file = "${postgresql::params::confdir}/postgresql_puppet_extras.conf"
 
   file { $pg_conf_include_file :
-    content => 'max_connections = 1234'
+    content => 'max_connections = 123'
   }
-
 }

spec/test_module/manifests/system_default/test_pgconf_include_cleanup.pp

@@ -2,7 +2,7 @@
 
   require postgresql::params
 
-  $pg_conf_include_file = "${postgresql::params::confdir}/postgresql_conf_extras.conf"
+  $pg_conf_include_file = "${postgresql::params::confdir}/postgresql_puppet_extras.conf"
 
   file { $pg_conf_include_file :
     ensure => absent