From a81abcc5c458dfdb3e483b8626c8a28eaac7d20e Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Sat, 8 Apr 2017 11:14:49 +0800 Subject: [PATCH] oslo db: check puppet resource instead of actual config in spec Change-Id: I2f681475fc4f3fe34587b372ebb0899410116251 --- spec/classes/barbican_db_spec.rb | 49 ++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/spec/classes/barbican_db_spec.rb b/spec/classes/barbican_db_spec.rb index 14afe795..24bf96cd 100644 --- a/spec/classes/barbican_db_spec.rb +++ b/spec/classes/barbican_db_spec.rb @@ -25,12 +25,14 @@ describe 'barbican::db' do context 'with default parameters' do - it { is_expected.to contain_barbican_config('database/connection').with_value('sqlite:////var/lib/barbican/barbican.sqlite') } - it { is_expected.to contain_barbican_config('database/idle_timeout').with_value('') } - it { is_expected.to contain_barbican_config('database/min_pool_size').with_value('') } - it { is_expected.to contain_barbican_config('database/max_retries').with_value('') } - it { is_expected.to contain_barbican_config('database/retry_interval').with_value('') } - it { is_expected.to contain_barbican_config('database/db_max_retries').with_value('') } + it { is_expected.to contain_oslo__db('barbican_config').with( + :db_max_retries => '', + :connection => 'sqlite:////var/lib/barbican/barbican.sqlite', + :idle_timeout => '', + :min_pool_size => '', + :max_retries => '', + :retry_interval => '', + )} # TODO(aschultz): remove once oslo is properly used it { is_expected.to contain_barbican_config('DEFAULT/sql_connection').with_value('sqlite:////var/lib/barbican/barbican.sqlite') } @@ -53,13 +55,15 @@ describe 'barbican::db' do } end - it { is_expected.to contain_barbican_config('database/connection').with_value('mysql+pymysql://barbican:barbican@localhost/barbican').with_secret(true) } - it { is_expected.to contain_barbican_config('database/idle_timeout').with_value('3601') } - it { is_expected.to contain_barbican_config('database/min_pool_size').with_value('2') } - it { is_expected.to contain_barbican_config('database/max_retries').with_value('11') } - it { is_expected.to contain_barbican_config('database/retry_interval').with_value('11') } - it { is_expected.to contain_barbican_config('database/max_overflow').with_value('11') } - it { is_expected.to contain_barbican_config('database/db_max_retries').with_value('-1') } + it { is_expected.to contain_oslo__db('barbican_config').with( + :db_max_retries => '-1', + :connection => 'mysql+pymysql://barbican:barbican@localhost/barbican', + :idle_timeout => '3601', + :min_pool_size => '2', + :max_retries => '11', + :retry_interval => '11', + :max_overflow => '11', + )} # TODO(aschultz) remove once oslo is properly used it { is_expected.to contain_barbican_config('DEFAULT/sql_connection').with_value('mysql+pymysql://barbican:barbican@localhost/barbican').with_secret(true) } @@ -70,7 +74,7 @@ describe 'barbican::db' do context 'with postgresql backend' do let :params do - { :database_connection => 'postgresql://barbican:barbican@localhost/barbican', } + { :database_connection => 'postgresql://barbican:barbican@localhost/barbican', } end it 'install the proper backend package' do @@ -80,7 +84,7 @@ describe 'barbican::db' do context 'with MySQL-python library as backend package' do let :params do - { :database_connection => 'mysql://barbican:barbican@localhost/barbican', } + { :database_connection => 'mysql://barbican:barbican@localhost/barbican', } end it { is_expected.to contain_package('python-mysqldb').with(:ensure => 'present') } @@ -88,7 +92,7 @@ describe 'barbican::db' do context 'with incorrect database_connection string' do let :params do - { :database_connection => 'redis://barbican:barbican@localhost/barbican', } + { :database_connection => 'redis://barbican:barbican@localhost/barbican', } end it_raises 'a Puppet::Error', /validate_re/ @@ -96,7 +100,7 @@ describe 'barbican::db' do context 'with incorrect pymysql database_connection string' do let :params do - { :database_connection => 'foo+pymysql://barbican:barbican@localhost/barbican', } + { :database_connection => 'foo+pymysql://barbican:barbican@localhost/barbican', } end it_raises 'a Puppet::Error', /validate_re/ @@ -105,8 +109,9 @@ describe 'barbican::db' do context 'on Debian platforms' do let :facts do - @default_facts.merge({ :osfamily => 'Debian', - :operatingsystem => 'Debian', + @default_facts.merge({ + :osfamily => 'Debian', + :operatingsystem => 'Debian', :operatingsystemrelease => 'jessie', }) end @@ -115,7 +120,7 @@ describe 'barbican::db' do context 'with sqlite backend' do let :params do - { :database_connection => 'sqlite:///var/lib/barbican/barbican.sqlite', } + { :database_connection => 'sqlite:///var/lib/barbican/barbican.sqlite', } end it 'install the proper backend package' do @@ -130,7 +135,7 @@ describe 'barbican::db' do context 'using pymysql driver' do let :params do - { :database_connection => 'mysql+pymysql://barbican:barbican@localhost/barbican', } + { :database_connection => 'mysql+pymysql://barbican:barbican@localhost/barbican', } end it 'install the proper backend package' do @@ -147,7 +152,7 @@ describe 'barbican::db' do shared_examples_for 'barbican db on redhat' do context 'using pymysql driver' do let :params do - { :database_connection => 'mysql+pymysql://barbican:barbican@localhost/barbican', } + { :database_connection => 'mysql+pymysql://barbican:barbican@localhost/barbican', } end it { is_expected.not_to contain_package('db_backend_package') }