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: I11e4c2fb242615029751175850961bf3113362e2
This commit is contained in:
parent
8d11cff893
commit
9a22663de8
|
@ -1,9 +1,10 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'vitrage::db' do
|
||||
|
||||
shared_examples 'vitrage::db' do
|
||||
context 'with default parameters' do
|
||||
it { should contain_class('vitrage::deps') }
|
||||
|
||||
it { is_expected.to contain_oslo__db('vitrage_config').with(
|
||||
:db_max_retries => '<SERVICE DEFAULT>',
|
||||
:connection => 'mysql+pymysql://vitrage:secrete@localhost:3306/vitrage',
|
||||
|
@ -19,7 +20,8 @@ describe 'vitrage::db' do
|
|||
|
||||
context 'with specific parameters' do
|
||||
let :params do
|
||||
{ :database_connection => 'mysql+pymysql://vitrage:vitrage@localhost/vitrage',
|
||||
{
|
||||
:database_connection => 'mysql+pymysql://vitrage:vitrage@localhost/vitrage',
|
||||
:database_idle_timeout => '3601',
|
||||
:database_min_pool_size => '2',
|
||||
:database_db_max_retries => '-1',
|
||||
|
@ -31,6 +33,8 @@ describe 'vitrage::db' do
|
|||
}
|
||||
end
|
||||
|
||||
it { should contain_class('vitrage::deps') }
|
||||
|
||||
it { is_expected.to contain_oslo__db('vitrage_config').with(
|
||||
:db_max_retries => '-1',
|
||||
:connection => 'mysql+pymysql://vitrage:vitrage@localhost/vitrage',
|
||||
|
@ -43,66 +47,6 @@ describe 'vitrage::db' do
|
|||
:pool_timeout => '21',
|
||||
)}
|
||||
end
|
||||
|
||||
context 'with postgresql backend' do
|
||||
let :params do
|
||||
{ :database_connection => 'postgresql://vitrage:vitrage@localhost/vitrage', }
|
||||
end
|
||||
|
||||
it 'install the proper backend package' do
|
||||
is_expected.to contain_package('python-psycopg2').with(:ensure => 'present')
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
context 'with MySQL-python library as backend package' do
|
||||
let :params do
|
||||
{ :database_connection => 'mysql+pymysql://vitrage:vitrage@localhost/vitrage', }
|
||||
end
|
||||
|
||||
it { is_expected.to contain_package('python-mysqldb').with(:ensure => 'present') }
|
||||
end
|
||||
|
||||
context 'with incorrect database_connection string' do
|
||||
let :params do
|
||||
{ :database_connection => 'redis://vitrage:vitrage@localhost/vitrage', }
|
||||
end
|
||||
|
||||
it_raises 'a Puppet::Error', /validate_re/
|
||||
end
|
||||
|
||||
context 'with incorrect pymysql database_connection string' do
|
||||
let :params do
|
||||
{ :database_connection => 'foo+pymysql://vitrage:vitrage@localhost/vitrage', }
|
||||
end
|
||||
|
||||
it_raises 'a Puppet::Error', /validate_re/
|
||||
end
|
||||
end
|
||||
|
||||
shared_examples_for 'vitrage::db on Debian platforms' do
|
||||
context 'using pymysql driver' do
|
||||
let :params do
|
||||
{ :database_connection => 'mysql+pymysql://vitrage:vitrage@localhost/vitrage', }
|
||||
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 'vitrage::db on RedHat platforms' do
|
||||
context 'using pymysql driver' do
|
||||
let :params do
|
||||
{ :database_connection => 'mysql+pymysql://vitrage:vitrage@localhost/vitrage', }
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
on_supported_os({
|
||||
|
@ -113,9 +57,7 @@ describe 'vitrage::db' do
|
|||
facts.merge!(OSDefaults.get_facts())
|
||||
end
|
||||
|
||||
it_configures 'vitrage::db'
|
||||
it_configures "vitrage::db on #{facts[:osfamily]} platforms"
|
||||
it_behaves_like 'vitrage::db'
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue