openstack/puppet-glance
Code Issues Proposed changes

Remove redundantly tested code

Browse Source 
Remove code that is redundantly tested.

This should not be tested here but in puppet-oslo
where this logic resides.

If we keep this and we do changes in puppet-oslo we
will break these unit tests, this is something we need
to sort out for all modules.

Change-Id: Ica25bf3735bc663b197ba97daad57f1dc4f26834
This commit is contained in:
Tobias Urdin 2019-01-18 10:28:07 +01:00
parent eeb1ba2e84
commit c2ffa65dbc
2 changed files with 20 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
spec/classes/glance_api_db_spec.rb
View File

@ -1,10 +1,11 @@
require 'spec_helper'
describe 'glance::api::db' do
shared_examples 'glance::api::db' do
context 'with default parameters' do
it { is_expected.to contain_oslo__db('glance_api_config').with(
it { should contain_class('glance::deps') }
it { should contain_oslo__db('glance_api_config').with(
:db_max_retries => '<SERVICE DEFAULT>',
:connection => 'sqlite:///var/lib/glance/glance.sqlite',
:idle_timeout => '<SERVICE DEFAULT>',
@ -19,7 +20,8 @@ describe 'glance::api::db' do
context 'with specific parameters' do
let :params do
{ :database_connection => 'mysql+pymysql://glance_api:glance@localhost/glance',
{
:database_connection => 'mysql+pymysql://glance_api:glance@localhost/glance',
:database_idle_timeout => '3601',
:database_min_pool_size => '2',
:database_max_retries => '11',
@ -31,7 +33,9 @@ describe 'glance::api::db' do
}
end
it { is_expected.to contain_oslo__db('glance_api_config').with(
it { should contain_class('glance::deps') }
it { should contain_oslo__db('glance_api_config').with(
:connection => 'mysql+pymysql://glance_api:glance@localhost/glance',
:idle_timeout => '3601',
:min_pool_size => '2',
@ -43,62 +47,17 @@ describe 'glance::api::db' do
:pool_timeout => '21',
)}
end
context 'with MySQL-python library as backend package' do
let :params do
{ :database_connection => 'mysql+pymysql://glance_api:glance@localhost/glance' }
end
it { is_expected.to contain_package('python-mysqldb').with(:ensure => 'present') }
end
context 'with incorrect pymysql database_connection string' do
let :params do
{ :database_connection => 'foo+pymysql://glance_api:glance@localhost/glance', }
end
it_raises 'a Puppet::Error', /validate_re/
end
end
shared_examples_for 'glance::api::db Debian' do
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://glance_api:glance@localhost/glance', }
end
it 'install the proper backend package' do
is_expected.to contain_package('python-pymysql').with(
:ensure => 'present',
:name => 'python-pymysql',
:tag => 'openstack'
)
end
end
end
shared_examples_for 'glance::api::db RedHat' do
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://glance_api:glance@localhost/glance', }
end
end
end
on_supported_os({
:supported_os => OSDefaults.get_supported_os
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
it_configures 'glance::api::db'
it_configures "glance::api::db #{facts[:osfamily]}"
it_behaves_like 'glance::api::db'
end
end
end

62
spec/classes/glance_registry_db_spec.rb
View File

@ -1,10 +1,11 @@
require 'spec_helper'
describe 'glance::registry::db' do
shared_examples 'glance::registry::db' do
context 'with default parameters' do
it { is_expected.to contain_oslo__db('glance_registry_config').with(
it { should contain_class('glance::deps') }
it { should contain_oslo__db('glance_registry_config').with(
:db_max_retries => '<SERVICE DEFAULT>',
:connection => 'sqlite:///var/lib/glance/glance.sqlite',
:idle_timeout => '<SERVICE DEFAULT>',
@ -19,7 +20,8 @@ describe 'glance::registry::db' do
context 'with specific parameters' do
let :params do
{ :database_db_max_retries => '-1',
{
:database_db_max_retries => '-1',
:database_connection => 'mysql+pymysql://glance_registry:glance@localhost/glance',
:database_idle_timeout => '3601',
:database_min_pool_size => '2',
@ -31,7 +33,9 @@ describe 'glance::registry::db' do
}
end
it { is_expected.to contain_oslo__db('glance_registry_config').with(
it { should contain_class('glance::deps') }
it { should contain_oslo__db('glance_registry_config').with(
:db_max_retries => '-1',
:connection => 'mysql+pymysql://glance_registry:glance@localhost/glance',
:idle_timeout => '3601',
@ -43,63 +47,17 @@ describe 'glance::registry::db' do
:pool_timeout => '21',
)}
end
context 'with MySQL-python library as backend package' do
let :params do
{ :database_connection => 'mysql+pymysql://glance_registry:glance@localhost/glance' }
end
it { is_expected.to contain_package('python-mysqldb').with(:ensure => 'present') }
end
context 'with incorrect pymysql database_connection string' do
let :params do
{ :database_connection => 'foo+pymysql://glance_registry:glance@localhost/glance', }
end
it_raises 'a Puppet::Error', /validate_re/
end
end
shared_examples_for 'glance::registry::db Debian' do
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://glance_registry:glance@localhost/glance', }
end
it 'install the proper backend package' do
is_expected.to contain_package('python-pymysql').with(
:ensure => 'present',
:name => 'python-pymysql',
:tag => 'openstack'
)
end
end
end
shared_examples_for 'glance::registry::db RedHat' do
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://glance_registry:glance@localhost/glance', }
end
end
end
on_supported_os({
:supported_os => OSDefaults.get_supported_os
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
it_configures 'glance::registry::db'
it_configures "glance::registry::db #{facts[:osfamily]}"
it_behaves_like 'glance::registry::db'
end
end
end