openstack/puppet-mistral
Code Issues Proposed changes

oslo log: check puppet resource instead of actual config in spec

Browse Source 
Change-Id: If37bd8f1abaefa58aed08cad5d75c889bcb3eab9
This commit is contained in:
Mykyta Karpin 2017-03-28 18:14:28 +03:00
parent 1de592a196
commit abc1883432
1 changed files with 51 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
spec/classes/mistral_logging_spec.rb
View File

@ -23,9 +23,9 @@ describe 'mistral::logging' do
:instance_format => '[instance: %(uuid)s] ', :instance_format => '[instance: %(uuid)s] ',
:instance_uuid_format => '[instance: %(uuid)s] ', :instance_uuid_format => '[instance: %(uuid)s] ',
:log_date_format => '%Y-%m-%d %H:%M:%S', :log_date_format => '%Y-%m-%d %H:%M:%S',
:use_syslog => false, :use_syslog => true,
:use_stderr => false, :use_stderr => false,
:log_facility => 'LOG_USER', :log_facility => 'LOG_FOO',
:log_dir => '/var/log', :log_dir => '/var/log',
:debug => true, :debug => true,
} }
@ -47,64 +47,69 @@ describe 'mistral::logging' do
it_configures 'logging params set' it_configures 'logging params set'
end end
context 'without extended logging options' do
it_configures 'logging params unset'
end
end end
shared_examples 'basic default logging settings' do shared_examples 'basic default logging settings' do
it 'configures mistral logging settings with default values' do it 'configures mistral logging settings with default values' do
is_expected.to contain_mistral_config('DEFAULT/use_syslog').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_oslo__log('mistral_config').with(
is_expected.to contain_mistral_config('DEFAULT/use_stderr').with(:value => '<SERVICE DEFAULT>') :use_syslog => '<SERVICE DEFAULT>',
is_expected.to contain_mistral_config('DEFAULT/syslog_log_facility').with(:value => '<SERVICE DEFAULT>') :use_stderr => '<SERVICE DEFAULT>',
is_expected.to contain_mistral_config('DEFAULT/log_dir').with(:value => '/var/log/mistral') :syslog_log_facility => '<SERVICE DEFAULT>',
is_expected.to contain_mistral_config('DEFAULT/debug').with(:value => '<SERVICE DEFAULT>') :log_dir => '/var/log/mistral',
:debug => '<SERVICE DEFAULT>',
)
end end
end end
shared_examples 'basic non-default logging settings' do shared_examples 'basic non-default logging settings' do
it 'configures mistral logging settings with non-default values' do it 'configures mistral logging settings with non-default values' do
is_expected.to contain_mistral_config('DEFAULT/use_syslog').with(:value => 'false') is_expected.to contain_oslo__log('mistral_config').with(
is_expected.to contain_mistral_config('DEFAULT/use_stderr').with(:value => 'false') :use_syslog => true,
is_expected.to contain_mistral_config('DEFAULT/syslog_log_facility').with(:value => 'LOG_USER') :use_stderr => false,
is_expected.to contain_mistral_config('DEFAULT/log_dir').with(:value => '/var/log') :syslog_log_facility => 'LOG_FOO',
is_expected.to contain_mistral_config('DEFAULT/debug').with(:value => 'true') :log_dir => '/var/log',
:debug => true,
)
end end
end end
shared_examples_for 'logging params set' do shared_examples_for 'logging params set' do
it 'enables logging params' do it 'enables logging params' do
is_expected.to contain_mistral_config('DEFAULT/logging_context_format_string').with_value( is_expected.to contain_oslo__log('mistral_config').with(
'%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s') :logging_context_format_string =>
'%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s',
is_expected.to contain_mistral_config('DEFAULT/logging_default_format_string').with_value( :logging_default_format_string => '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s',
'%(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',
is_expected.to contain_mistral_config('DEFAULT/logging_debug_format_suffix').with_value( :log_config_append => '/etc/mistral/logging.conf',
'%(funcName)s %(pathname)s:%(lineno)d') :publish_errors => true,
:default_log_levels => {
is_expected.to contain_mistral_config('DEFAULT/logging_exception_prefix').with_value( 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
'%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s') 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN',
'requests.packages.urllib3.connectionpool' => 'WARN' },
is_expected.to contain_mistral_config('DEFAULT/log_config_append').with_value( :fatal_deprecations => true,
'/etc/mistral/logging.conf') :instance_format => '[instance: %(uuid)s] ',
is_expected.to contain_mistral_config('DEFAULT/publish_errors').with_value( :instance_uuid_format => '[instance: %(uuid)s] ',
true) :log_date_format => '%Y-%m-%d %H:%M:%S',
)
is_expected.to contain_mistral_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_mistral_config('DEFAULT/fatal_deprecations').with_value(
true)
is_expected.to contain_mistral_config('DEFAULT/instance_format').with_value(
'[instance: %(uuid)s] ')
is_expected.to contain_mistral_config('DEFAULT/instance_uuid_format').with_value(
'[instance: %(uuid)s] ')
is_expected.to contain_mistral_config('DEFAULT/log_date_format').with_value(
'%Y-%m-%d %H:%M:%S')
end end
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('mistral_config').with("#{param}" => '<SERVICE DEFAULT>') }
}
end
on_supported_os({ on_supported_os({
:supported_os => OSDefaults.get_supported_os :supported_os => OSDefaults.get_supported_os
}).each do |os,facts| }).each do |os,facts|