From e08195a646ec76294f58ae0dfc772c2ddfd7135e Mon Sep 17 00:00:00 2001 From: Mykyta Karpin Date: Tue, 14 Mar 2017 18:37:04 +0200 Subject: [PATCH] oslo log: check puppet resource instead of actual config in spec Change-Id: Ib6313bcc9bd7c8f9850e3a7b289ca61db242ebd7 --- spec/classes/cinder_logging_spec.rb | 98 +++++++++++++++-------------- 1 file changed, 51 insertions(+), 47 deletions(-) diff --git a/spec/classes/cinder_logging_spec.rb b/spec/classes/cinder_logging_spec.rb index 1164beae..7d531656 100644 --- a/spec/classes/cinder_logging_spec.rb +++ b/spec/classes/cinder_logging_spec.rb @@ -23,9 +23,9 @@ describe 'cinder::logging' do :instance_format => '[instance: %(uuid)s] ', :instance_uuid_format => '[instance: %(uuid)s] ', :log_date_format => '%Y-%m-%d %H:%M:%S', - :use_syslog => false, + :use_syslog => true, :use_stderr => false, - :log_facility => 'LOG_USER', + :log_facility => 'LOG_FOO', :log_dir => '/var/log', :debug => true, } @@ -34,77 +34,81 @@ describe 'cinder::logging' do shared_examples_for 'cinder-logging' do context 'with basic logging options and default settings' do - it_configures 'basic default logging settings' + it_behaves_like 'basic default logging settings' end context 'with basic logging options and non-default settings' do before { params.merge!( log_params ) } - it_configures 'basic non-default logging settings' + it_behaves_like 'basic non-default logging settings' end context 'with extended logging options' do before { params.merge!( log_params ) } - it_configures 'logging params set' + it_behaves_like 'logging params set' + end + + context 'without extended logging options' do + it_behaves_like 'logging params unset' end end shared_examples 'basic default logging settings' do it 'configures cinder logging settings with default values' do - is_expected.to contain_cinder_config('DEFAULT/use_syslog').with(:value => '') - is_expected.to contain_cinder_config('DEFAULT/use_stderr').with(:value => '') - is_expected.to contain_cinder_config('DEFAULT/syslog_log_facility').with(:value => '') - is_expected.to contain_cinder_config('DEFAULT/log_dir').with(:value => '/var/log/cinder') - is_expected.to contain_cinder_config('DEFAULT/debug').with(:value => '') + is_expected.to contain_oslo__log('cinder_config').with( + :use_syslog => '', + :use_stderr => '', + :log_dir => '/var/log/cinder', + :debug => '', + ) end end shared_examples 'basic non-default logging settings' do it 'configures cinder logging settings with non-default values' do - is_expected.to contain_cinder_config('DEFAULT/use_syslog').with(:value => 'false') - is_expected.to contain_cinder_config('DEFAULT/use_stderr').with(:value => 'false') - is_expected.to contain_cinder_config('DEFAULT/syslog_log_facility').with(:value => 'LOG_USER') - is_expected.to contain_cinder_config('DEFAULT/log_dir').with(:value => '/var/log') - is_expected.to contain_cinder_config('DEFAULT/debug').with(:value => 'true') + is_expected.to contain_oslo__log('cinder_config').with( + :use_syslog => true, + :use_stderr => false, + :syslog_log_facility => 'LOG_FOO', + :log_dir => '/var/log', + :debug => true, + ) end end shared_examples_for 'logging params set' do it 'enables logging params' do - is_expected.to contain_cinder_config('DEFAULT/logging_context_format_string').with_value( - '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s') - - is_expected.to contain_cinder_config('DEFAULT/logging_default_format_string').with_value( - '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s') - - is_expected.to contain_cinder_config('DEFAULT/logging_debug_format_suffix').with_value( - '%(funcName)s %(pathname)s:%(lineno)d') - - is_expected.to contain_cinder_config('DEFAULT/logging_exception_prefix').with_value( - '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s') - - is_expected.to contain_cinder_config('DEFAULT/log_config_append').with_value( - '/etc/cinder/logging.conf') - is_expected.to contain_cinder_config('DEFAULT/publish_errors').with_value( - true) - - is_expected.to contain_cinder_config('DEFAULT/default_log_levels').with_value( - 'amqp=WARN,amqplib=WARN,boto=WARN,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,sqlalchemy=WARN,suds=INFO') - - is_expected.to contain_cinder_config('DEFAULT/fatal_deprecations').with_value( - true) - - is_expected.to contain_cinder_config('DEFAULT/instance_format').with_value( - '[instance: %(uuid)s] ') - - is_expected.to contain_cinder_config('DEFAULT/instance_uuid_format').with_value( - '[instance: %(uuid)s] ') - - is_expected.to contain_cinder_config('DEFAULT/log_date_format').with_value( - '%Y-%m-%d %H:%M:%S') + is_expected.to contain_oslo__log('cinder_config').with( + :logging_context_format_string => + '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s', + :logging_default_format_string => '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s', + :logging_debug_format_suffix => '%(funcName)s %(pathname)s:%(lineno)d', + :logging_exception_prefix => '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s', + :log_config_append => '/etc/cinder/logging.conf', + :publish_errors => true, + :default_log_levels => { + 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', + 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN', + 'requests.packages.urllib3.connectionpool' => 'WARN' }, + :fatal_deprecations => true, + :instance_format => '[instance: %(uuid)s] ', + :instance_uuid_format => '[instance: %(uuid)s] ', + :log_date_format => '%Y-%m-%d %H:%M:%S', + ) end end + shared_examples_for 'logging params unset' do + [ :logging_context_format_string, :logging_default_format_string, + :logging_debug_format_suffix, :logging_exception_prefix, + :log_config_append, :publish_errors, + :default_log_levels, :fatal_deprecations, + :instance_format, :instance_uuid_format, + :log_date_format, ].each { |param| + it { is_expected.to contain_oslo__log('cinder_config').with("#{param}" => '') } + } + end + on_supported_os({ :supported_os => OSDefaults.get_supported_os }).each do |os,facts| @@ -113,7 +117,7 @@ describe 'cinder::logging' do facts.merge(OSDefaults.get_facts({:os_workers => 8})) end - it_configures 'cinder-logging' + it_behaves_like 'cinder-logging' end end