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: Icb78bf4106f9692b5d5a6f58e82c8c18e3770d9c
This commit is contained in:
@@ -1,28 +1,26 @@
|
|||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe 'nova::db' do
|
describe 'nova::db' do
|
||||||
|
|
||||||
let :params do
|
let :params do
|
||||||
{}
|
{}
|
||||||
end
|
end
|
||||||
|
|
||||||
shared_examples 'nova::db' do
|
shared_examples 'nova::db' do
|
||||||
|
|
||||||
context 'with default parameters' do
|
context 'with default parameters' do
|
||||||
it { is_expected.to_not contain_nova_config('database/db_max_retries') }
|
it { should_not contain_nova_config('database/db_max_retries') }
|
||||||
it { is_expected.to_not contain_nova_config('database/connection') }
|
it { should_not contain_nova_config('database/connection') }
|
||||||
it { is_expected.to_not contain_nova_config('database/slave_connection') }
|
it { should_not contain_nova_config('database/slave_connection') }
|
||||||
it { is_expected.to_not contain_nova_config('api_database/connection') }
|
it { should_not contain_nova_config('api_database/connection') }
|
||||||
it { is_expected.to_not contain_nova_config('api_database/slave_connection') }
|
it { should_not contain_nova_config('api_database/slave_connection') }
|
||||||
it { is_expected.to_not contain_nova_config('placement_database/connection') }
|
it { should_not contain_nova_config('placement_database/connection') }
|
||||||
it { is_expected.to_not contain_nova_config('placement_database/slave_connection') }
|
it { should_not contain_nova_config('placement_database/slave_connection') }
|
||||||
it { is_expected.to_not contain_nova_config('database/idle_timeout') }
|
it { should_not contain_nova_config('database/idle_timeout') }
|
||||||
it { is_expected.to_not contain_nova_config('database/min_pool_size') }
|
it { should_not contain_nova_config('database/min_pool_size') }
|
||||||
it { is_expected.to_not contain_nova_config('database/max_pool_size') }
|
it { should_not contain_nova_config('database/max_pool_size') }
|
||||||
it { is_expected.to_not contain_nova_config('database/max_retries') }
|
it { should_not contain_nova_config('database/max_retries') }
|
||||||
it { is_expected.to_not contain_nova_config('database/retry_interval') }
|
it { should_not contain_nova_config('database/retry_interval') }
|
||||||
it { is_expected.to_not contain_nova_config('database/max_overflow') }
|
it { should_not contain_nova_config('database/max_overflow') }
|
||||||
it { is_expected.to_not contain_nova_config('database/pool_timeout') }
|
it { should_not contain_nova_config('database/pool_timeout') }
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with overridden parameters' do
|
context 'with overridden parameters' do
|
||||||
@@ -37,7 +35,7 @@ describe 'nova::db' do
|
|||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
it { is_expected.to contain_oslo__db('nova_config').with(
|
it { should contain_oslo__db('nova_config').with(
|
||||||
:connection => 'mysql+pymysql://user:pass@db/db1',
|
:connection => 'mysql+pymysql://user:pass@db/db1',
|
||||||
:slave_connection => 'mysql+pymysql://user:pass@slave/db1',
|
:slave_connection => 'mysql+pymysql://user:pass@slave/db1',
|
||||||
:db_max_retries => '<SERVICE DEFAULT>',
|
:db_max_retries => '<SERVICE DEFAULT>',
|
||||||
@@ -49,88 +47,12 @@ describe 'nova::db' do
|
|||||||
:max_overflow => '<SERVICE DEFAULT>',
|
:max_overflow => '<SERVICE DEFAULT>',
|
||||||
:pool_timeout => '<SERVICE DEFAULT>',
|
:pool_timeout => '<SERVICE DEFAULT>',
|
||||||
)}
|
)}
|
||||||
it { is_expected.to contain_nova_config('api_database/connection').with_value('mysql+pymysql://user:pass@db/db2').with_secret(true) }
|
|
||||||
it { is_expected.to contain_nova_config('api_database/slave_connection').with_value('mysql+pymysql://user:pass@slave/db2').with_secret(true) }
|
|
||||||
it { is_expected.to contain_nova_config('placement_database/connection').with_value('mysql+pymysql://user:pass@db/db2').with_secret(true) }
|
|
||||||
it { is_expected.to contain_nova_config('placement_database/slave_connection').with_value('mysql+pymysql://user:pass@slave/db2').with_secret(true) }
|
|
||||||
end
|
|
||||||
|
|
||||||
|
it { should contain_nova_config('api_database/connection').with_value('mysql+pymysql://user:pass@db/db2').with_secret(true) }
|
||||||
context 'with postgresql backend' do
|
it { should contain_nova_config('api_database/slave_connection').with_value('mysql+pymysql://user:pass@slave/db2').with_secret(true) }
|
||||||
let :params do
|
it { should contain_nova_config('placement_database/connection').with_value('mysql+pymysql://user:pass@db/db2').with_secret(true) }
|
||||||
{ :database_connection => 'postgresql://nova:nova@localhost/nova', }
|
it { should contain_nova_config('placement_database/slave_connection').with_value('mysql+pymysql://user:pass@slave/db2').with_secret(true) }
|
||||||
end
|
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://user:pass@db/db', }
|
|
||||||
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://nova:nova@localhost/nova', }
|
|
||||||
end
|
|
||||||
|
|
||||||
it_raises 'a Puppet::Error', /validate_re/
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'with incorrect pymysql database_connection string' do
|
|
||||||
let :params do
|
|
||||||
{ :database_connection => 'foo+pymysql://user:pass@db/db', }
|
|
||||||
end
|
|
||||||
|
|
||||||
it_raises 'a Puppet::Error', /validate_re/
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
shared_examples_for 'nova::db RedHat' do
|
|
||||||
context 'using pymysql driver' do
|
|
||||||
let :params do
|
|
||||||
{ :database_connection => 'mysql+pymysql://user:pass@db/db', }
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
shared_examples_for 'nova::db Debian' do
|
|
||||||
|
|
||||||
context 'using pymysql driver' do
|
|
||||||
let :params do
|
|
||||||
{ :database_connection => 'mysql+pymysql://user:pass@db/db', }
|
|
||||||
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
|
|
||||||
|
|
||||||
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
|
end
|
||||||
|
|
||||||
on_supported_os({
|
on_supported_os({
|
||||||
@@ -141,9 +63,7 @@ describe 'nova::db' do
|
|||||||
facts.merge!(OSDefaults.get_facts())
|
facts.merge!(OSDefaults.get_facts())
|
||||||
end
|
end
|
||||||
|
|
||||||
it_configures 'nova::db'
|
it_behaves_like 'nova::db'
|
||||||
it_configures "nova::db #{facts[:osfamily]}"
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user