openstack
/
fuel-library
Code Issues Proposed changes

Merge "[puppet4] Fix noop tests"

This commit is contained in:
Jenkins 2017-02-15 12:21:26 +00:00 committed by Gerrit Code Review
parent 38f91bf47c 11aecb3c84
commit a55c0fa67e
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/noop/spec/hosts/logging/logging_spec.rb
View File

@ -38,6 +38,17 @@ describe manifest do
)
}
end
# Because of https://github.com/rodjek/rspec-puppet/issues/253 array of hashes in Puppet3
# is interpreted as array of arrays in rspec-puppet
if Puppet.version < 4.0
$rservers = [ ['remote_type', Noop.puppet_function('pick', base_syslog['syslog_transport'], 'tcp')],
['server', base_syslog['syslog_server']],
['port', base_syslog['syslog_port']]]
else
$rservers = ['remote_type' => Noop.puppet_function('pick', base_syslog['syslog_transport'], 'tcp'),
'server' => base_syslog['syslog_server'],
'port' => base_syslog['syslog_port']]
end
it { is_expected.to contain_service('rsyslog') }
@ -52,11 +63,7 @@ describe manifest do
:keep => '4',
:minsize => '10M',
:maxsize => '100M',
:rservers => [
['remote_type', Noop.puppet_function('pick', base_syslog['syslog_transport'], 'tcp')],
['server', base_syslog['syslog_server']],
['port', base_syslog['syslog_port']]
],
:rservers => rservers,
:virtual => Noop.puppet_function('str2bool', facts[:is_virtual]),
:rabbit_fqdn_prefix => Noop.hiera('node_name_prefix_for_messaging', 'messaging-'),
:rabbit_log_level => 'NOTICE',