opuppet/module-postgresql
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Karel Brezina 2013-01-31 14:30:21 +01:00
parent a4ec366811
commit ed29a9931d
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
spec/support/shared_examples/system_default_postgres.rb
View file

@ -161,8 +161,10 @@ shared_examples :system_default_postgres do
# Run again to check for idempotence # Run again to check for idempotence
sudo_and_log(vm, "puppet apply --detailed-exitcodes -e '#{test_class}'") 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 # 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": }' cleanup_class = 'class {"postgresql_tests::system_default::test_pgconf_include_cleanup": }'
sudo_and_log(vm, "puppet apply -e '#{cleanup_class}'") sudo_and_log(vm, "puppet apply -e '#{cleanup_class}'")

5
spec/test_module/manifests/system_default/test_pgconf_include.pp
View file

@ -2,10 +2,9 @@ class postgresql_tests::system_default::test_pgconf_include {
require postgresql::params 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 : file { $pg_conf_include_file :
content => 'max_connections = 1234' content => 'max_connections = 123'
} }
} }

2
spec/test_module/manifests/system_default/test_pgconf_include_cleanup.pp
View file

@ -2,7 +2,7 @@ class postgresql_tests::system_default::test_pgconf_include_cleanup {
require postgresql::params 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 : file { $pg_conf_include_file :
ensure => absent ensure => absent