Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix f38 acceptance tests failing on rsyslog-elasticsearch #237

Merged
merged 1 commit into from
Oct 20, 2023
+15 −0
Merged

fix f38 acceptance tests failing on rsyslog-elasticsearch #237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions spec/acceptance/actions_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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