X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fkeystone%2Fspec%2Fclasses%2Fkeystone_logging_spec.rb;h=f0ac50d7c5265847b24600c9df7bdc3dce2372e7;hb=71a236efd9f45828d875a0a5fd025108bb1dcada;hp=7ae935201b354830154f400ca48497e0795a4853;hpb=b8fa2c1a5ec9dbcd1d2f9e9b41afdde4c603aa35;p=dsa-puppet.git diff --git a/3rdparty/modules/keystone/spec/classes/keystone_logging_spec.rb b/3rdparty/modules/keystone/spec/classes/keystone_logging_spec.rb index 7ae93520..f0ac50d7 100644 --- a/3rdparty/modules/keystone/spec/classes/keystone_logging_spec.rb +++ b/3rdparty/modules/keystone/spec/classes/keystone_logging_spec.rb @@ -42,36 +42,36 @@ describe 'keystone::logging' do shared_examples_for 'logging params set' do it 'enables logging params' do - should contain_keystone_config('DEFAULT/logging_context_format_string').with_value( + is_expected.to contain_keystone_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') - should contain_keystone_config('DEFAULT/logging_default_format_string').with_value( + is_expected.to contain_keystone_config('DEFAULT/logging_default_format_string').with_value( '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s') - should contain_keystone_config('DEFAULT/logging_debug_format_suffix').with_value( + is_expected.to contain_keystone_config('DEFAULT/logging_debug_format_suffix').with_value( '%(funcName)s %(pathname)s:%(lineno)d') - should contain_keystone_config('DEFAULT/logging_exception_prefix').with_value( + is_expected.to contain_keystone_config('DEFAULT/logging_exception_prefix').with_value( '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s') - should contain_keystone_config('DEFAULT/log_config_append').with_value( + is_expected.to contain_keystone_config('DEFAULT/log_config_append').with_value( '/etc/keystone/logging.conf') - should contain_keystone_config('DEFAULT/publish_errors').with_value( + is_expected.to contain_keystone_config('DEFAULT/publish_errors').with_value( true) - should contain_keystone_config('DEFAULT/default_log_levels').with_value( + is_expected.to contain_keystone_config('DEFAULT/default_log_levels').with_value( 'amqp=WARN,amqplib=WARN,boto=WARN,iso8601=WARN,qpid=WARN,requests.packages.urllib3.connectionpool=WARN,sqlalchemy=WARN,suds=INFO') - should contain_keystone_config('DEFAULT/fatal_deprecations').with_value( + is_expected.to contain_keystone_config('DEFAULT/fatal_deprecations').with_value( true) - should contain_keystone_config('DEFAULT/instance_format').with_value( + is_expected.to contain_keystone_config('DEFAULT/instance_format').with_value( '[instance: %(uuid)s] ') - should contain_keystone_config('DEFAULT/instance_uuid_format').with_value( + is_expected.to contain_keystone_config('DEFAULT/instance_uuid_format').with_value( '[instance: %(uuid)s] ') - should contain_keystone_config('DEFAULT/log_date_format').with_value( + is_expected.to contain_keystone_config('DEFAULT/log_date_format').with_value( '%Y-%m-%d %H:%M:%S') end end @@ -84,7 +84,7 @@ describe 'keystone::logging' do :default_log_levels, :fatal_deprecations, :instance_format, :instance_uuid_format, :log_date_format, ].each { |param| - it { should contain_keystone_config("DEFAULT/#{param}").with_ensure('absent') } + it { is_expected.to contain_keystone_config("DEFAULT/#{param}").with_ensure('absent') } } end