Fix Test

initial refactoring of acceptance fix test failing on puppet 8 remove unused erlang module from fixture bump dependency version
voxpupuli · Apr 2, 2024 · 0586249 · 0586249
1 parent c4785ff
commit 0586249
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 245 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -3,6 +3,5 @@ fixtures:
     stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib'
     apt: 'https://github.com/puppetlabs/puppetlabs-apt'
     archive: 'https://github.com/voxpupuli/puppet-archive'
-    erlang: 'https://github.com/garethr/garethr-erlang'
     systemd: 'https://github.com/voxpupuli/puppet-systemd'
     yumrepo_core: 'https://github.com/puppetlabs/puppetlabs-yumrepo_core'
diff --git a/lib/puppet/type/rabbitmq_parameter.rb b/lib/puppet/type/rabbitmq_parameter.rb
@@ -106,8 +106,10 @@ def validate_value(value)
   def munge_value(value)
     return value if value(:autoconvert) == :false
 
-    value.each do |k, v|
-      value[k] = v.to_i if v =~ %r{\A[-+]?[0-9]+\z}
+    value.each do |_k, v|
+      next if v.is_a?(Array)
+
+      value[_k] = v.to_i if v =~ %r{\A[-+]?[0-9]+\z}
     end
     value
   end

diff --git a/metadata.json b/metadata.json
@@ -58,15 +58,15 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.25.0 < 9.0.0"
+      "version_requirement": ">= 4.25.0 < 10.0.0"
     },
     {
       "name": "puppet/archive",
-      "version_requirement": ">= 2.0.0 < 7.0.0"
+      "version_requirement": ">= 2.0.0 < 8.0.0"
     },
     {
       "name": "puppet/systemd",
-      "version_requirement": ">= 2.10.0 < 5.0.0"
+      "version_requirement": ">= 2.10.0 < 7.0.0"
     }
   ],
   "tags": [

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -13,18 +13,14 @@
   end
 
   context 'default class inclusion' do
-    let(:pp) do
-      <<-EOS
-      class { 'rabbitmq': }
-      if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
+    it_behaves_like 'an idempotent resource' do
+      let(:manifest) do
+        <<-PUPPET
+        class { 'rabbitmq': }
+        PUPPET
+      end
     end
 
-    it_behaves_like 'an idempotent resource'
-
     describe package(package_name) do
       it { is_expected.to be_installed }
     end
@@ -49,20 +45,20 @@ class { 'erlang': epel_enable => true}
   end
 
   context 'disable and stop service' do
-    let(:pp) do
-      <<-EOS
-        class { 'rabbitmq':
-          service_ensure => 'stopped',
-        }
-        if $facts['os']['family'] == 'RedHat' {
-          class { 'erlang': epel_enable => true}
-          Class['erlang'] -> Class['rabbitmq']
-        }
-      EOS
+    it_behaves_like 'an idempotent resource' do
+      let(:manifest) do
+        <<-PUPPET
+          class { 'rabbitmq':
+            service_ensure => 'stopped',
+          }
+          if $facts['os']['family'] == 'RedHat' {
+            class { 'erlang': epel_enable => true}
+            Class['erlang'] -> Class['rabbitmq']
+          }
+        PUPPET
+      end
     end
 
-    it_behaves_like 'an idempotent resource'
-
     describe service(service_name) do
       it { is_expected.not_to be_enabled }
       it { is_expected.not_to be_running }
@@ -73,21 +69,13 @@ class { 'erlang': epel_enable => true}
     it 'runs successfully' do
       pp_pre = <<-EOS
         class { 'rabbitmq': }
-        if $facts['os']['family'] == 'RedHat' {
-          class { 'erlang': epel_enable => true}
-          Class['erlang'] -> Class['rabbitmq']
-        }
       EOS
 
       pp = <<-EOS
         class { 'rabbitmq':
           service_manage => false,
           service_ensure  => 'stopped',
         }
-        if $facts['os']['family'] == 'RedHat' {
-          class { 'erlang': epel_enable => true}
-          Class['erlang'] -> Class['rabbitmq']
-        }
       EOS
 
       apply_manifest(pp_pre, catch_failures: true)
@@ -101,19 +89,19 @@ class { 'erlang': epel_enable => true}
   end
 
   context 'binding on all interfaces' do
-    let(:pp) do
-      <<-EOS
-      class { 'rabbitmq':
-        service_manage    => true,
-        port              => 5672,
-        admin_enable      => true,
-        node_ip_address   => '0.0.0.0'
-      }
-      EOS
+    it_behaves_like 'an idempotent resource' do
+      let(:manifest) do
+        <<-PUPPET
+        class { 'rabbitmq':
+          service_manage    => true,
+          port              => 5672,
+          admin_enable      => true,
+          node_ip_address   => '0.0.0.0'
+        }
+        PUPPET
+      end
     end
 
-    it_behaves_like 'an idempotent resource'
-
     describe service(service_name) do
       it { is_expected.to be_running }
     end
@@ -134,19 +122,19 @@ class { 'rabbitmq':
   end
 
   context 'binding to localhost only' do
-    let(:pp) do
-      <<-EOS
-        class { 'rabbitmq':
-          service_manage    => true,
-          port              => 5672,
-          admin_enable      => true,
-          node_ip_address   => '127.0.0.1'
-        }
-      EOS
+    it_behaves_like 'an idempotent resource' do
+      let(:manifest) do
+        <<-PUPPET
+          class { 'rabbitmq':
+            service_manage    => true,
+            port              => 5672,
+            admin_enable      => true,
+            node_ip_address   => '127.0.0.1'
+          }
+        PUPPET
+      end
     end
 
-    it_behaves_like 'an idempotent resource'
-
     describe service(service_name) do
       it { is_expected.to be_running }
     end
@@ -169,23 +157,23 @@ class { 'rabbitmq':
   end
 
   context 'ssl enabled' do
-    let(:pp) do
-      <<-EOS
-        class { 'rabbitmq':
-          service_manage  => true,
-          admin_enable    => true,
-          node_ip_address => '0.0.0.0',
-          ssl_interface   => '0.0.0.0',
-          ssl             => true,
-          ssl_cacert      => '/tmp/cacert.crt',
-          ssl_cert        => '/tmp/rabbitmq.crt',
-          ssl_key         => '/tmp/rabbitmq.key',
-        }
-      EOS
+    it_behaves_like 'an idempotent resource' do
+      let(:manifest) do
+        <<-PUPPET
+          class { 'rabbitmq':
+            service_manage  => true,
+            admin_enable    => true,
+            node_ip_address => '0.0.0.0',
+            ssl_interface   => '0.0.0.0',
+            ssl             => true,
+            ssl_cacert      => '/tmp/cacert.crt',
+            ssl_cert        => '/tmp/rabbitmq.crt',
+            ssl_key         => '/tmp/rabbitmq.key',
+          }
+        PUPPET
+      end
     end
 
-    it_behaves_like 'an idempotent resource'
-
     describe service(service_name) do
       it { is_expected.to be_running }
     end
@@ -200,20 +188,20 @@ class { 'rabbitmq':
   end
 
   context 'different management_ip_address and node_ip_address' do
-    let(:pp) do
-      <<-EOS
+    it_behaves_like 'an idempotent resource' do
+      let(:manifest) do
+        <<-PUPPET
         class { 'rabbitmq':
           service_manage        => true,
           port                  => 5672,
           admin_enable          => true,
           node_ip_address       => '0.0.0.0',
           management_ip_address => '127.0.0.1'
         }
-      EOS
+        PUPPET
+      end
     end
 
-    it_behaves_like 'an idempotent resource'
-
     describe service(service_name) do
       it { is_expected.to be_running }
     end

diff --git a/spec/acceptance/clustering_spec.rb b/spec/acceptance/clustering_spec.rb
@@ -14,10 +14,6 @@ class { 'rabbitmq':
         erlang_cookie            => 'TESTCOOKIE',
         wipe_db_on_cookie_change => false,
       }
-      if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
       EOS
 
       apply_manifest(pp, expect_failures: true)
@@ -39,10 +35,6 @@ class { 'rabbitmq':
         erlang_cookie            => 'TESTCOOKIE',
         wipe_db_on_cookie_change => true,
       }
-      if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
       EOS
 
       apply_manifest(pp, catch_failures: true)
@@ -84,10 +76,6 @@ class { 'rabbitmq':
         environment_variables    => { 'NODENAME' => 'rabbit@foobar' },
         erlang_cookie            => 'TESTCOOKIE',
       }
-      if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
       EOS
 
       apply_manifest(pp, expect_failures: true)

diff --git a/spec/acceptance/delete_guest_user_spec.rb b/spec/acceptance/delete_guest_user_spec.rb
@@ -10,10 +10,6 @@ class { 'rabbitmq':
         port              => 5672,
         delete_guest_user => true,
       }
-      if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
       EOS
 
       apply_manifest(pp, catch_failures: true)

diff --git a/spec/acceptance/parameter_spec.rb b/spec/acceptance/parameter_spec.rb
@@ -6,10 +6,6 @@
   context 'create parameter resource' do
     it 'runs successfully' do
       pp = <<-EOS
-      if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true }
-        Class['erlang'] -> Class['rabbitmq']
-      }
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,

diff --git a/spec/acceptance/policy_spec.rb b/spec/acceptance/policy_spec.rb
@@ -6,10 +6,6 @@
   context 'create policy resource' do
     it 'runs successfully' do
       pp = <<-EOS
-      if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true }
-        Class['erlang'] -> Class['rabbitmq']
-      }
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,

diff --git a/spec/acceptance/queue_spec.rb b/spec/acceptance/queue_spec.rb
@@ -6,10 +6,6 @@
   context 'create binding and queue resources when using default management port' do
     it 'runs successfully' do
       pp = <<-EOS
-      if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true }
-        Class['erlang'] -> Class['rabbitmq']
-      }
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,
@@ -80,10 +76,6 @@ class { 'rabbitmq':
   context 'create multiple bindings when same source / destination / vhost but different routing keys' do
     it 'runs successfully' do
       pp = <<-EOS
-      if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true }
-        Class['erlang'] -> Class['rabbitmq']
-      }
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,
@@ -168,10 +160,6 @@ class { 'rabbitmq':
   context 'create binding and queue resources when using a non-default management port' do
     it 'runs successfully' do
       pp = <<-EOS
-      if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true }
-        Class['erlang'] -> Class['rabbitmq']
-      }
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,

diff --git a/spec/acceptance/rabbitmqadmin_spec.rb b/spec/acceptance/rabbitmqadmin_spec.rb
@@ -10,10 +10,6 @@ class { 'rabbitmq':
         admin_enable   => true,
         service_manage => true,
       }
-      if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
       EOS
 
       apply_manifest(pp, catch_failures: true)
@@ -31,10 +27,6 @@ class { 'rabbitmq':
         admin_enable   => true,
         service_manage => false,
       }
-      if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
       EOS
 
       shell('rm -f /var/lib/rabbitmq/rabbitmqadmin')
@@ -55,10 +47,6 @@ class { 'rabbitmq':
         default_user   => 'foobar',
         default_pass   => 'bazblam',
       }
-      if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
       EOS
 
       pp = <<-EOS
@@ -68,10 +56,6 @@ class { 'rabbitmq':
         default_user   => 'foobar',
         default_pass   => 'bazblam',
       }
-      if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
       EOS
 
       shell('rm -f /var/lib/rabbitmq/rabbitmqadmin')

diff --git a/spec/acceptance/user_spec.rb b/spec/acceptance/user_spec.rb
@@ -6,10 +6,6 @@
   context 'create user resource' do
     it 'runs successfully' do
       pp = <<-EOS
-      if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true }
-        Class['erlang'] -> Class['rabbitmq']
-      }
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,