From 11aecb3c84a8eb4ebc0875d0a23006b98a4f38dd Mon Sep 17 00:00:00 2001 From: Mykyta Karpin Date: Fri, 10 Feb 2017 14:44:33 +0200 Subject: [PATCH] [puppet4] Fix noop tests Because of https://github.com/rodjek/rspec-puppet/issues/253 array of hashes in Puppet3 is interpreted as array of arrays in rspec-puppet Change-Id: I85f14880ba55277afa1df1e07f05fd893bff4c46 Closes-Bug: #1663563 --- tests/noop/spec/hosts/logging/logging_spec.rb | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/noop/spec/hosts/logging/logging_spec.rb b/tests/noop/spec/hosts/logging/logging_spec.rb index 3870519ac9..021cffa73a 100644 --- a/tests/noop/spec/hosts/logging/logging_spec.rb +++ b/tests/noop/spec/hosts/logging/logging_spec.rb @@ -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',