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

Fix the way we remove postgresql::client.

Browse source
This commit is contained in:
Ashley Penney 2014-05-09 16:36:31 -04:00
parent 05b77232f9
commit e947e96e79
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Gemfile
View file

@ -1,13 +1,14 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org" source ENV['GEM_SOURCE'] || "https://rubygems.org"
group :development, :test do group :development, :test do
gem 'rake', '10.1.1'
gem 'puppetlabs_spec_helper', :require => false gem 'puppetlabs_spec_helper', :require => false
gem 'rspec-puppet', '~> 1.0' gem 'beaker', '~> 1.11.0', :require => false
gem 'puppet-lint', '~> 0.3.2' gem 'beaker-rspec', :path => '~/source/beaker-rspec', :require => false
gem 'beaker', :require => false gem 'rspec-puppet'
gem 'beaker-rspec', :require => false gem 'puppet-lint'
gem 'serverspec', :require => false gem 'serverspec'
gem 'specinfra', '~> 1.11.0'
gem 'jwt', '~> 0.1'
end end
if puppetversion = ENV['PUPPET_GEM_VERSION'] if puppetversion = ENV['PUPPET_GEM_VERSION']

12
spec/acceptance/server_spec.rb
View file

@ -12,8 +12,8 @@ describe 'server:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))
after :all do after :all do
# Cleanup after tests have ran # Cleanup after tests have ran
pp = <<-EOS.unindent pp = <<-EOS.unindent
class { 'postgresql::server': ensure => absent } class { 'postgresql::server': ensure => absent } ->
class { 'postgresql::client': ensure => absent } class { 'postgresql::client': package_ensure => absent }
EOS EOS
apply_manifest(pp, :catch_failures => true) apply_manifest(pp, :catch_failures => true)
if fact('operatingsystem') == 'RedHat' if fact('operatingsystem') == 'RedHat'
@ -82,9 +82,9 @@ describe 'server without defaults:', :unless => UNSUPPORTED_PLATFORMS.include?(f
} }
class { 'postgresql::server': class { 'postgresql::server':
ensure => absent, ensure => absent,
} } ->
class { 'postgresql::client': class { 'postgresql::client':
ensure => absent, package_ensure => absent,
} }
EOS EOS
apply_manifest(pp, :catch_failures => true) apply_manifest(pp, :catch_failures => true)
@ -133,9 +133,9 @@ describe 'server without defaults:', :unless => UNSUPPORTED_PLATFORMS.include?(f
} }
class { 'postgresql::server': class { 'postgresql::server':
ensure => absent, ensure => absent,
} } ->
class { 'postgresql::client': class { 'postgresql::client':
ensure => absent, package_ensure => absent,
} }
EOS EOS
apply_manifest(pp, :catch_failures => true) apply_manifest(pp, :catch_failures => true)