Merge "Remove redundantly tested code"

This commit is contained in:
Zuul 2019-01-19 00:05:17 +00:00 committed by Gerrit Code Review
commit 043f441e2a
1 changed files with 10 additions and 25 deletions

View File

@ -1,10 +1,11 @@
require 'spec_helper'
describe 'magnum::db' do
shared_examples 'magnum::db' do
context 'with default parameters' do
it { is_expected.to contain_oslo__db('magnum_config').with(
it { should contain_class('magnum::deps') }
it { should contain_oslo__db('magnum_config').with(
:db_max_retries => '<SERVICE DEFAULT>',
:connection => 'mysql+pymysql://magnum:magnum@localhost:3306/magnum',
:idle_timeout => '<SERVICE DEFAULT>',
@ -19,7 +20,8 @@ describe 'magnum::db' do
context 'with specific parameters' do
let :params do
{ :database_connection => 'mysql+pymysql://magnum:magnum@localhost/magnum',
{
:database_connection => 'mysql+pymysql://magnum:magnum@localhost/magnum',
:database_idle_timeout => '3601',
:database_min_pool_size => '2',
:database_max_retries => '11',
@ -31,7 +33,9 @@ describe 'magnum::db' do
}
end
it { is_expected.to contain_oslo__db('magnum_config').with(
it { should contain_class('magnum::deps') }
it { should contain_oslo__db('magnum_config').with(
:db_max_retries => '-1',
:connection => 'mysql+pymysql://magnum:magnum@localhost/magnum',
:idle_timeout => '3601',
@ -43,36 +47,17 @@ describe 'magnum::db' do
:pool_timeout => '21',
)}
end
context 'with postgresql backend' do
let :params do
{ :database_connection => 'postgresql://magnum:magnum@localhost/magnum', }
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 => 'invalid://magnum:magnum@localhost/magnum', }
end
it_raises 'a Puppet::Error', /validate_re/
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 'magnum::db'
it_behaves_like 'magnum::db'
end
end
end