Merge "Remove redundant unit test cases"
This commit is contained in:
commit
9856c9b6cc
|
@ -35,12 +35,6 @@ describe 'barbican::db' do
|
|||
:pool_timeout => '<SERVICE DEFAULT>',
|
||||
:mysql_enable_ndb => '<SERVICE DEFAULT>',
|
||||
)}
|
||||
|
||||
# TODO(aschultz): remove once oslo is properly used
|
||||
it { should contain_barbican_config('DEFAULT/sql_connection').with_value('sqlite:////var/lib/barbican/barbican.sqlite') }
|
||||
it { should contain_barbican_config('DEFAULT/sql_idle_timeout').with_value('<SERVICE DEFAULT>') }
|
||||
it { should contain_barbican_config('DEFAULT/sql_pool_size').with_value('<SERVICE DEFAULT>') }
|
||||
it { should contain_barbican_config('DEFAULT/sql_pool_max_overflow').with_value('<SERVICE DEFAULT>') }
|
||||
end
|
||||
|
||||
context 'with specific parameters' do
|
||||
|
@ -72,12 +66,6 @@ describe 'barbican::db' do
|
|||
:pool_timeout => '11',
|
||||
:mysql_enable_ndb => true,
|
||||
)}
|
||||
|
||||
# TODO(aschultz) remove once oslo is properly used
|
||||
it { should contain_barbican_config('DEFAULT/sql_connection').with_value('mysql+pymysql://barbican:barbican@localhost/barbican').with_secret(true) }
|
||||
it { should contain_barbican_config('DEFAULT/sql_idle_timeout').with_value('3601') }
|
||||
it { should contain_barbican_config('DEFAULT/sql_pool_size').with_value('2') }
|
||||
it { should contain_barbican_config('DEFAULT/sql_pool_max_overflow').with_value('11') }
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue