From e65b91d61b4a3bc6fa43a491940d6ddf14916d3c Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Fri, 20 Oct 2023 14:22:07 -0700 Subject: [PATCH] fix f38 acceptance tests failing on rsyslog-elasticsearch --- spec/acceptance/actions_spec.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/spec/acceptance/actions_spec.rb b/spec/acceptance/actions_spec.rb index 03f9b782..a2920f60 100644 --- a/spec/acceptance/actions_spec.rb +++ b/spec/acceptance/actions_spec.rb @@ -46,5 +46,20 @@ class { 'rsyslog::config': is_expected.to match(%r{# myaction\naction\(type="omelasticsearch"\n.*name="myaction"\n.*host=\["127.0.0.1", "192.168.0.1"\]\n.*queue.type="linkedlist"\n.*queue.spoolDirectory="/var/log/rsyslog/queue"\n.*\)}) end end + + # rm the rsyslog-elasticsearch package as it will block the uninstall of + # the rsyslog package in other acceptance tests + if fact('os.name') == 'Fedora' + it 'applies with action' do + pp = <<-MANIFEST + if $facts['os']['name'] == 'Fedora' { + package { 'rsyslog-elasticsearch': ensure => absent } + } + MANIFEST + + apply_manifest(pp, catch_failures: true) + apply_manifest(pp, catch_changes: true) + end + end end end