openstack/puppet-openstacklib
Code Issues Proposed changes

Fix unit tests failing against Puppet 4.3.0

Browse Source 
Change-Id: I66f09b3f827217aa33c17cf286c4ecd63be7b86a
Related-bug: #1518871
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
This commit is contained in:
Gael Chamoulaud
2015-11-27 15:06:12 +01:00
parent 21c5f820c7
commit 6d6b7d120b
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spec/defines/openstacklib_db_postgresql_spec.rb
View File

@@ -9,11 +9,18 @@ describe 'openstacklib::db::postgresql' do
{ :password_hash => password_hash } { :password_hash => password_hash }
end end
let (:pre_condition) do
"include ::postgresql::server"
end
context 'on a RedHat osfamily' do context 'on a RedHat osfamily' do
let :facts do let :facts do
{ {
:postgres_default_version => '8.4', :osfamily => 'RedHat',
:osfamily => 'RedHat' :operatingsystem => 'RedHat',
:operatingsystemrelease => '7.1',
:operatingsystemmajrelease => '7',
:concat_basedir => '/tmp',
} }
end end
@@ -45,7 +52,8 @@ describe 'openstacklib::db::postgresql' do
context 'when notifying other resources' do context 'when notifying other resources' do
let :pre_condition do let :pre_condition do
'exec { "nova-db-sync": }' "include ::postgresql::server
exec { 'nova-db-sync': }"
end end
let :params do let :params do
{ :notify => 'Exec[nova-db-sync]'}.merge(required_params) { :notify => 'Exec[nova-db-sync]'}.merge(required_params)
@@ -56,7 +64,8 @@ describe 'openstacklib::db::postgresql' do
context 'when required for other openstack services' do context 'when required for other openstack services' do
let :pre_condition do let :pre_condition do
'service {"keystone":}' "include ::postgresql::server
service {'keystone':}"
end end
let :title do let :title do
'keystone' 'keystone'
@@ -73,7 +82,11 @@ describe 'openstacklib::db::postgresql' do
context 'on a Debian osfamily' do context 'on a Debian osfamily' do
let :facts do let :facts do
{ {
:osfamily => 'Debian' :osfamily => 'Debian',
:operatingsystem => 'Debian',
:operatingsystemrelease => 'jessie',
:operatingsystemmajrelease => '8.2',
:concat_basedir => '/tmp',
} }
end end
@@ -105,7 +118,8 @@ describe 'openstacklib::db::postgresql' do
context 'when notifying other resources' do context 'when notifying other resources' do
let :pre_condition do let :pre_condition do
'exec { "nova-db-sync": }' "include ::postgresql::server
exec { 'nova-db-sync': }"
end end
let :params do let :params do
{ :notify => 'Exec[nova-db-sync]'}.merge(required_params) { :notify => 'Exec[nova-db-sync]'}.merge(required_params)
@@ -116,7 +130,8 @@ describe 'openstacklib::db::postgresql' do
context 'when required for other openstack services' do context 'when required for other openstack services' do
let :pre_condition do let :pre_condition do
'service {"keystone":}' "include ::postgresql::server
service {'keystone':}"
end end
let :title do let :title do
'keystone' 'keystone'