openstack
/
puppet-heat
Code Issues Proposed changes

Merge "Add os_service_default support to heat tests"

This commit is contained in:
Jenkins 2015-11-20 13:24:22 +00:00 committed by Gerrit Code Review
parent 9feac68da1 d57948dcfe
commit 35bf220a37
16 changed files with 86 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spec/classes/heat_api_cfn_spec.rb
View File

@ -118,7 +118,9 @@ describe 'heat::api_cfn' do
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
@default_facts.merge({
:osfamily => 'Debian',
})
end
let :platform_params do
@ -130,7 +132,9 @@ describe 'heat::api_cfn' do
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
@default_facts.merge({
:osfamily => 'RedHat',
})
end
let :platform_params do

8
spec/classes/heat_api_cloudwatch_spec.rb
View File

@ -117,7 +117,9 @@ describe 'heat::api_cloudwatch' do
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
@default_facts.merge({
:osfamily => 'Debian',
})
end
let :platform_params do
@ -129,7 +131,9 @@ describe 'heat::api_cloudwatch' do
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
@default_facts.merge({
:osfamily => 'RedHat',
})
end
let :platform_params do

8
spec/classes/heat_api_spec.rb
View File

@ -117,7 +117,9 @@ describe 'heat::api' do
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
@default_facts.merge({
:osfamily => 'Debian',
})
end
let :platform_params do
@ -129,7 +131,9 @@ describe 'heat::api' do
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
@default_facts.merge({
:osfamily => 'RedHat',
})
end
let :platform_params do

8
spec/classes/heat_client_spec.rb
View File

@ -29,7 +29,9 @@ describe 'heat::client' do
context 'on Debian platform' do
let :facts do
{ :osfamily => 'Debian' }
@default_facts.merge({
:osfamily => 'Debian',
})
end
it_configures 'heat client'
@ -37,7 +39,9 @@ describe 'heat::client' do
context 'on RedHat platform' do
let :facts do
{ :osfamily => 'RedHat' }
@default_facts.merge({
:osfamily => 'RedHat',
})
end
it_configures 'heat client'

8
spec/classes/heat_db_mysql_spec.rb
View File

@ -1,9 +1,11 @@
require 'spec_helper'
describe 'heat::db::mysql' do
let :facts do
{ :osfamily => 'RedHat' }
end
let :facts do
@default_facts.merge({
:osfamily => 'RedHat',
})
end
let :params do
{ :password => 's3cr3t',

4
spec/classes/heat_db_postgresql_spec.rb
View File

@ -36,12 +36,12 @@ describe 'heat::db::postgresql' do
context 'on a Debian osfamily' do
let :facts do
{
@default_facts.merge({
:operatingsystemrelease => '7.8',
:operatingsystem => 'Debian',
:osfamily => 'Debian',
:concat_basedir => '/var/lib/puppet/concat'
}
})
end
context 'with only required parameters' do

10
spec/classes/heat_db_spec.rb
View File

@ -57,10 +57,11 @@ describe 'heat::db' do
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian',
@default_facts.merge({
:osfamily => 'Debian',
:operatingsystem => 'Debian',
:operatingsystemrelease => 'jessie',
}
})
end
it_configures 'heat::db'
@ -68,9 +69,10 @@ describe 'heat::db' do
context 'on Redhat platforms' do
let :facts do
{ :osfamily => 'RedHat',
@default_facts.merge({
:osfamily => 'RedHat',
:operatingsystemrelease => '7.1',
}
})
end
it_configures 'heat::db'

8
spec/classes/heat_db_sync_spec.rb
View File

@ -18,11 +18,11 @@ describe 'heat::db::sync' do
context 'on a RedHat osfamily' do
let :facts do
{
@default_facts.merge({
:osfamily => 'RedHat',
:operatingsystemrelease => '7.0',
:concat_basedir => '/var/lib/puppet/concat'
}
})
end
it_configures 'heat-dbsync'
@ -30,12 +30,12 @@ describe 'heat::db::sync' do
context 'on a Debian osfamily' do
let :facts do
{
@default_facts.merge({
:operatingsystemrelease => '7.8',
:operatingsystem => 'Debian',
:osfamily => 'Debian',
:concat_basedir => '/var/lib/puppet/concat'
}
})
end
it_configures 'heat-dbsync'

8
spec/classes/heat_engine_spec.rb
View File

@ -98,7 +98,9 @@ describe 'heat::engine' do
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
@default_facts.merge({
:osfamily => 'Debian',
})
end
let :os_params do
@ -112,7 +114,9 @@ describe 'heat::engine' do
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
@default_facts.merge({
:osfamily => 'RedHat',
})
end
let :os_params do

8
spec/classes/heat_init_spec.rb
View File

@ -428,7 +428,9 @@ describe 'heat' do
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
@default_facts.merge({
:osfamily => 'Debian',
})
end
let :platform_params do
@ -440,7 +442,9 @@ describe 'heat' do
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
@default_facts.merge({
:osfamily => 'RedHat',
})
end
let :platform_params do

8
spec/classes/heat_keystone_auth_cfn_spec.rb
View File

@ -149,7 +149,9 @@ describe 'heat::keystone::auth_cfn' do
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
@default_facts.merge({
:osfamily => 'Debian',
})
end
it_configures 'heat keystone auth'
@ -157,7 +159,9 @@ describe 'heat::keystone::auth_cfn' do
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
@default_facts.merge({
:osfamily => 'RedHat',
})
end
it_configures 'heat keystone auth'

8
spec/classes/heat_keystone_auth_spec.rb
View File

@ -183,7 +183,9 @@ describe 'heat::keystone::auth' do
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
@default_facts.merge({
:osfamily => 'Debian',
})
end
it_configures 'heat keystone auth'
@ -191,7 +193,9 @@ describe 'heat::keystone::auth' do
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
@default_facts.merge({
:osfamily => 'RedHat',
})
end
it_configures 'heat keystone auth'

8
spec/classes/heat_keystone_domain_spec.rb
View File

@ -70,7 +70,9 @@ describe 'heat::keystone::domain' do
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
@default_facts.merge({
:osfamily => 'Debian',
})
end
it_configures 'heat keystone domain'
@ -78,7 +80,9 @@ describe 'heat::keystone::domain' do
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
@default_facts.merge({
:osfamily => 'RedHat',
})
end
it_configures 'heat keystone domain'

8
spec/classes/heat_logging_spec.rb
View File

@ -126,7 +126,9 @@ describe 'heat::logging' do
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
@default_facts.merge({
:osfamily => 'Debian',
})
end
it_configures 'heat-logging'
@ -134,7 +136,9 @@ describe 'heat::logging' do
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
@default_facts.merge({
:osfamily => 'RedHat',
})
end
it_configures 'heat-logging'

8
spec/classes/heat_policy_spec.rb
View File

@ -25,7 +25,9 @@ describe 'heat::policy' do
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
@default_facts.merge({
:osfamily => 'Debian',
})
end
it_configures 'heat policies'
@ -33,7 +35,9 @@ describe 'heat::policy' do
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
@default_facts.merge({
:osfamily => 'RedHat',
})
end
it_configures 'heat policies'

3
spec/spec_helper.rb
View File

@ -5,6 +5,9 @@ require 'webmock/rspec'
RSpec.configure do |c|
c.alias_it_should_behave_like_to :it_configures, 'configures'
c.alias_it_should_behave_like_to :it_raises, 'raises'
c.before :each do
@default_facts = { :os_service_default => '<SERVICE DEFAULT>' }
end
end
at_exit { RSpec::Puppet::Coverage.report! }