Remove redundantly tested code

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: I92545e5dcd1404568dfee00fa9d2480a526a5c16
This commit is contained in:
Tobias Urdin 2019-01-18 10:37:10 +01:00
parent 9667e22cd9
commit 4352d42f34
2 changed files with 8 additions and 113 deletions

View File

@ -53,6 +53,7 @@ class ironic::db (
$database_db_max_retries = $::os_service_default,
$database_pool_timeout = $::os_service_default,
) {
include ::ironic::deps
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function

View File

@ -1,12 +1,11 @@
require 'spec_helper'
describe 'ironic::db' do
shared_examples 'ironic::db' do
context 'with default parameters' do
it { should contain_class('ironic::deps') }
it { is_expected.to contain_oslo__db('ironic_config').with(
it { should contain_oslo__db('ironic_config').with(
:db_max_retries => '<SERVICE DEFAULT>',
:connection => 'sqlite:////var/lib/ironic/ovs.sqlite',
:idle_timeout => '<SERVICE DEFAULT>',
@ -17,12 +16,12 @@ describe 'ironic::db' do
:retry_interval => '<SERVICE DEFAULT>',
:max_overflow => '<SERVICE DEFAULT>',
)}
end
context 'with specific parameters' do
let :params do
{ :database_connection => 'mysql+pymysql://ironic:ironic@localhost/ironic',
{
:database_connection => 'mysql+pymysql://ironic:ironic@localhost/ironic',
:database_idle_timeout => '3601',
:database_min_pool_size => '2',
:database_max_pool_size => '21',
@ -34,7 +33,9 @@ describe 'ironic::db' do
}
end
it { is_expected.to contain_oslo__db('ironic_config').with(
it { should contain_class('ironic::deps') }
it { should contain_oslo__db('ironic_config').with(
:db_max_retries => '-1',
:connection => 'mysql+pymysql://ironic:ironic@localhost/ironic',
:idle_timeout => '3601',
@ -45,87 +46,6 @@ describe 'ironic::db' do
:max_overflow => '21',
:pool_timeout => '21',
)}
end
context 'with MySQL-python library as backend package' do
let :params do
{ :database_connection => 'mysql://ironic:ironic@localhost/ironic' }
end
it { is_expected.to contain_oslo__db('ironic_config').with(
:connection => 'mysql://ironic:ironic@localhost/ironic',
)}
end
context 'with postgresql backend' do
let :params do
{ :database_connection => 'postgresql://ironic:ironic@localhost/ironic', }
end
it 'install the proper backend package' do
is_expected.to contain_package('python-psycopg2').with(:ensure => 'present')
end
end
context 'with incorrect database_connection string' do
let :params do
{ :database_connection => 'redis://ironic:ironic@localhost/ironic', }
end
it_raises 'a Puppet::Error', /validate_re/
end
context 'with incorrect database_connection string' do
let :params do
{ :database_connection => 'foo+pymysql://ironic:ironic@localhost/ironic', }
end
it_raises 'a Puppet::Error', /validate_re/
end
end
shared_examples_for 'ironic::db on Debian platforms' do
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://ironic:ironic@localhost/ironic' }
end
it 'install the proper backend package' do
is_expected.to contain_package('python-pymysql').with(
:ensure => 'present',
:name => platform_params[:pymysql_package_name],
:tag => ['openstack'],
)
end
end
context 'with sqlite backend' do
let :params do
{ :database_connection => 'sqlite:///var/lib/nova/nova.sqlite', }
end
it 'install the proper backend package' do
is_expected.to contain_package('python-pysqlite2').with(
:ensure => 'present',
:name => 'python-pysqlite2',
:tag => ['openstack'],
)
end
end
end
shared_examples_for 'ironic::db on RedHat platforms' do
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://ironic:ironic@localhost/ironic' }
end
end
end
@ -140,33 +60,7 @@ describe 'ironic::db' do
}))
end
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
if facts[:os_package_type] == 'debian' then
pymysql_pkgname = 'python3-pymysql'
else
pymysql_pkgname = 'python-pymysql'
end
{
:pymysql_package_name => pymysql_pkgname,
}
when 'RedHat'
{
:pymysql_package_name => 'python-pymysql',
}
end
end
case facts[:osfamily]
when 'Debian'
it_behaves_like 'ironic::db on Debian platforms'
when 'RedHat'
it_behaves_like 'ironic::db on RedHat platforms'
end
it_behaves_like 'ironic::db'
end
end
end