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

Jump to bottom

Fix acceptance tests on Arch and Ubuntu w/ Puppet 6 #1501

Merged
merged 2 commits into from
Mar 15, 2022
Merged

Fix acceptance tests on Arch and Ubuntu w/ Puppet 6 #1501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f382b7a
Skip passenger tests on non-RH and non-Debian
ekohl Mar 14, 2022
b029ecc
Install lsb-release on Facter 3
ekohl Mar 15, 2022
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
4 changes: 2 additions & 2 deletions spec/acceptance/class_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
end
end

context 'nginx with package_source passenger' do
context 'nginx with package_source passenger', if: pkg_cmd do
it 'runs successfully' do
shell(pkg_remove_cmd)
pp = <<-EOS
Expand Down Expand Up @@ -73,7 +73,7 @@ class { 'nginx':
end
end

context 'reset to default parameters' do
context 'reset to default parameters', if: pkg_cmd do
it 'runs successfully' do
shell(pkg_remove_cmd)
pp = "class { 'nginx': }"
Expand Down
8 changes: 8 additions & 0 deletions spec/setup_acceptance_node.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
if $facts['os']['name'] == 'Ubuntu' {
# Facter < 4 needs lsb-release for os.distro.codename
if versioncmp($facts['facterversion'], '4.0.0') <= 0 {
package { 'lsb-release':
ensure => installed,
}
}
}
Comment on lines +1 to +8
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a fan of adding this to every single module that needs it.
At least if we do we should probably add it to a file that can be easily removed with modulesync?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's common, perhaps it's something that should live in voxpupuli-acceptance? Right now I don't have time to work on that, but can review things if needed.