openstack/puppet-glance
Code Issues Proposed changes

oslo db: check puppet resource instead of actual config in spec

Browse Source 
Change-Id: Ie511b047870974096e2db52c6d7a381cb59b78a1
This commit is contained in:
ZhongShengping 2017-04-09 12:17:45 +08:00
parent 97a16cc066
commit 45bd308020
2 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
spec/classes/glance_api_db_spec.rb
View File

@ -4,13 +4,15 @@ describe 'glance::api::db' do
shared_examples 'glance::api::db' do shared_examples 'glance::api::db' do
context 'with default parameters' do context 'with default parameters' do
it { is_expected.to contain_glance_api_config('database/connection').with_value('sqlite:///var/lib/glance/glance.sqlite').with_secret(true) } it { is_expected.to contain_oslo__db('glance_api_config').with(
it { is_expected.to contain_glance_api_config('database/idle_timeout').with_value('<SERVICE DEFAULT>') } :connection => 'sqlite:///var/lib/glance/glance.sqlite',
it { is_expected.to contain_glance_api_config('database/min_pool_size').with_value('<SERVICE DEFAULT>') } :idle_timeout => '<SERVICE DEFAULT>',
it { is_expected.to contain_glance_api_config('database/max_retries').with_value('<SERVICE DEFAULT>') } :min_pool_size => '<SERVICE DEFAULT>',
it { is_expected.to contain_glance_api_config('database/retry_interval').with_value('<SERVICE DEFAULT>') } :max_pool_size => '<SERVICE DEFAULT>',
it { is_expected.to contain_glance_api_config('database/max_pool_size').with_value('<SERVICE DEFAULT>') } :max_retries => '<SERVICE DEFAULT>',
it { is_expected.to contain_glance_api_config('database/max_overflow').with_value('<SERVICE DEFAULT>') } :retry_interval => '<SERVICE DEFAULT>',
:max_overflow => '<SERVICE DEFAULT>',
)}
end end
context 'with specific parameters' do context 'with specific parameters' do
@ -25,13 +27,15 @@ describe 'glance::api::db' do
} }
end end
it { is_expected.to contain_glance_api_config('database/connection').with_value('mysql+pymysql://glance_api:glance@localhost/glance').with_secret(true) } it { is_expected.to contain_oslo__db('glance_api_config').with(
it { is_expected.to contain_glance_api_config('database/idle_timeout').with_value('3601') } :connection => 'mysql+pymysql://glance_api:glance@localhost/glance',
it { is_expected.to contain_glance_api_config('database/min_pool_size').with_value('2') } :idle_timeout => '3601',
it { is_expected.to contain_glance_api_config('database/max_retries').with_value('11') } :min_pool_size => '2',
it { is_expected.to contain_glance_api_config('database/retry_interval').with_value('11') } :max_pool_size => '11',
it { is_expected.to contain_glance_api_config('database/max_pool_size').with_value('11') } :max_retries => '11',
it { is_expected.to contain_glance_api_config('database/max_overflow').with_value('21') } :retry_interval => '11',
:max_overflow => '21',
)}
end end
context 'with MySQL-python library as backend package' do context 'with MySQL-python library as backend package' do

36
spec/classes/glance_registry_db_spec.rb
View File

@ -4,14 +4,16 @@ describe 'glance::registry::db' do
shared_examples 'glance::registry::db' do shared_examples 'glance::registry::db' do
context 'with default parameters' do context 'with default parameters' do
it { is_expected.to contain_glance_registry_config('database/db_max_retries').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_oslo__db('glance_registry_config').with(
it { is_expected.to contain_glance_registry_config('database/connection').with_value('sqlite:///var/lib/glance/glance.sqlite').with_secret(true) } :db_max_retries => '<SERVICE DEFAULT>',
it { is_expected.to contain_glance_registry_config('database/idle_timeout').with_value('<SERVICE DEFAULT>') } :connection => 'sqlite:///var/lib/glance/glance.sqlite',
it { is_expected.to contain_glance_registry_config('database/min_pool_size').with_value('<SERVICE DEFAULT>') } :idle_timeout => '<SERVICE DEFAULT>',
it { is_expected.to contain_glance_registry_config('database/max_retries').with_value('<SERVICE DEFAULT>') } :min_pool_size => '<SERVICE DEFAULT>',
it { is_expected.to contain_glance_registry_config('database/retry_interval').with_value('<SERVICE DEFAULT>') } :max_pool_size => '<SERVICE DEFAULT>',
it { is_expected.to contain_glance_registry_config('database/max_pool_size').with_value('<SERVICE DEFAULT>') } :max_retries => '<SERVICE DEFAULT>',
it { is_expected.to contain_glance_registry_config('database/max_overflow').with_value('<SERVICE DEFAULT>') } :retry_interval => '<SERVICE DEFAULT>',
:max_overflow => '<SERVICE DEFAULT>',
)}
end end
context 'with specific parameters' do context 'with specific parameters' do
@ -27,14 +29,16 @@ describe 'glance::registry::db' do
} }
end end
it { is_expected.to contain_glance_registry_config('database/db_max_retries').with_value('-1') } it { is_expected.to contain_oslo__db('glance_registry_config').with(
it { is_expected.to contain_glance_registry_config('database/connection').with_value('mysql+pymysql://glance_registry:glance@localhost/glance').with_secret(true) } :db_max_retries => '-1',
it { is_expected.to contain_glance_registry_config('database/idle_timeout').with_value('3601') } :connection => 'mysql+pymysql://glance_registry:glance@localhost/glance',
it { is_expected.to contain_glance_registry_config('database/min_pool_size').with_value('2') } :idle_timeout => '3601',
it { is_expected.to contain_glance_registry_config('database/max_retries').with_value('11') } :min_pool_size => '2',
it { is_expected.to contain_glance_registry_config('database/retry_interval').with_value('11') } :max_pool_size => '11',
it { is_expected.to contain_glance_registry_config('database/max_pool_size').with_value('11') } :max_retries => '11',
it { is_expected.to contain_glance_registry_config('database/max_overflow').with_value('21') } :retry_interval => '11',
:max_overflow => '21',
)}
end end
context 'with MySQL-python library as backend package' do context 'with MySQL-python library as backend package' do