Merge pull request #1501 from ekohl/fix-tests

Fix acceptance tests on Arch and Ubuntu w/ Puppet 6
voxpupuli · Mar 15, 2022 · 5fc8139 · 5fc8139
2 parents 6e7596a + b029ecc
commit 5fc8139
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -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
@@ -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': }"

diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp
@@ -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,
+    }
+  }
+}