Skip to content

Commit 13e510c

Browse files
author
Roberto Valentini
committed
Fix Test
initial refactoring of acceptance fix test failing on puppet 8 remove unused erlang module from fixture bump dependency version
1 parent c4785ff commit 13e510c

15 files changed

+105
-243
lines changed

‎.fixtures.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ fixtures:
33
stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib'
44
apt: 'https://github.com/puppetlabs/puppetlabs-apt'
55
archive: 'https://github.com/voxpupuli/puppet-archive'
6-
erlang: 'https://github.com/garethr/garethr-erlang'
76
systemd: 'https://github.com/voxpupuli/puppet-systemd'
87
yumrepo_core: 'https://github.com/puppetlabs/puppetlabs-yumrepo_core'

‎lib/puppet/type/rabbitmq_parameter.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ def munge_value(value)
107107
return value if value(:autoconvert) == :false
108108

109109
value.each do |k, v|
110+
next if v.is_a?(Array)
111+
110112
value[k] = v.to_i if v =~ %r{\A[-+]?[0-9]+\z}
111113
end
112114
value

‎metadata.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@
5858
"dependencies": [
5959
{
6060
"name": "puppetlabs/stdlib",
61-
"version_requirement": ">= 4.25.0 < 9.0.0"
61+
"version_requirement": ">= 4.25.0 < 10.0.0"
6262
},
6363
{
6464
"name": "puppet/archive",
65-
"version_requirement": ">= 2.0.0 < 7.0.0"
65+
"version_requirement": ">= 2.0.0 < 8.0.0"
6666
},
6767
{
6868
"name": "puppet/systemd",
69-
"version_requirement": ">= 2.10.0 < 5.0.0"
69+
"version_requirement": ">= 2.10.0 < 7.0.0"
7070
}
7171
],
7272
"tags": [

‎spec/acceptance/class_spec.rb

Lines changed: 60 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,14 @@
1313
end
1414

1515
context 'default class inclusion' do
16-
let(:pp) do
17-
<<-EOS
18-
class { 'rabbitmq': }
19-
if $facts['os']['family'] == 'RedHat' {
20-
class { 'erlang': epel_enable => true}
21-
Class['erlang'] -> Class['rabbitmq']
22-
}
23-
EOS
16+
it_behaves_like 'an idempotent resource' do
17+
let(:manifest) do
18+
<<-PUPPET
19+
class { 'rabbitmq': }
20+
PUPPET
21+
end
2422
end
2523

26-
it_behaves_like 'an idempotent resource'
27-
2824
describe package(package_name) do
2925
it { is_expected.to be_installed }
3026
end
@@ -49,20 +45,20 @@ class { 'erlang': epel_enable => true}
4945
end
5046

5147
context 'disable and stop service' do
52-
let(:pp) do
53-
<<-EOS
54-
class { 'rabbitmq':
55-
service_ensure => 'stopped',
56-
}
57-
if $facts['os']['family'] == 'RedHat' {
58-
class { 'erlang': epel_enable => true}
59-
Class['erlang'] -> Class['rabbitmq']
60-
}
61-
EOS
48+
it_behaves_like 'an idempotent resource' do
49+
let(:manifest) do
50+
<<-PUPPET
51+
class { 'rabbitmq':
52+
service_ensure => 'stopped',
53+
}
54+
if $facts['os']['family'] == 'RedHat' {
55+
class { 'erlang': epel_enable => true}
56+
Class['erlang'] -> Class['rabbitmq']
57+
}
58+
PUPPET
59+
end
6260
end
6361

64-
it_behaves_like 'an idempotent resource'
65-
6662
describe service(service_name) do
6763
it { is_expected.not_to be_enabled }
6864
it { is_expected.not_to be_running }
@@ -73,21 +69,13 @@ class { 'erlang': epel_enable => true}
7369
it 'runs successfully' do
7470
pp_pre = <<-EOS
7571
class { 'rabbitmq': }
76-
if $facts['os']['family'] == 'RedHat' {
77-
class { 'erlang': epel_enable => true}
78-
Class['erlang'] -> Class['rabbitmq']
79-
}
8072
EOS
8173

8274
pp = <<-EOS
8375
class { 'rabbitmq':
8476
service_manage => false,
8577
service_ensure => 'stopped',
8678
}
87-
if $facts['os']['family'] == 'RedHat' {
88-
class { 'erlang': epel_enable => true}
89-
Class['erlang'] -> Class['rabbitmq']
90-
}
9179
EOS
9280

9381
apply_manifest(pp_pre, catch_failures: true)
@@ -101,19 +89,19 @@ class { 'erlang': epel_enable => true}
10189
end
10290

10391
context 'binding on all interfaces' do
104-
let(:pp) do
105-
<<-EOS
106-
class { 'rabbitmq':
107-
service_manage => true,
108-
port => 5672,
109-
admin_enable => true,
110-
node_ip_address => '0.0.0.0'
111-
}
112-
EOS
92+
it_behaves_like 'an idempotent resource' do
93+
let(:manifest) do
94+
<<-PUPPET
95+
class { 'rabbitmq':
96+
service_manage => true,
97+
port => 5672,
98+
admin_enable => true,
99+
node_ip_address => '0.0.0.0'
100+
}
101+
PUPPET
102+
end
113103
end
114104

115-
it_behaves_like 'an idempotent resource'
116-
117105
describe service(service_name) do
118106
it { is_expected.to be_running }
119107
end
@@ -134,19 +122,19 @@ class { 'rabbitmq':
134122
end
135123

136124
context 'binding to localhost only' do
137-
let(:pp) do
138-
<<-EOS
139-
class { 'rabbitmq':
140-
service_manage => true,
141-
port => 5672,
142-
admin_enable => true,
143-
node_ip_address => '127.0.0.1'
144-
}
145-
EOS
125+
it_behaves_like 'an idempotent resource' do
126+
let(:manifest) do
127+
<<-PUPPET
128+
class { 'rabbitmq':
129+
service_manage => true,
130+
port => 5672,
131+
admin_enable => true,
132+
node_ip_address => '127.0.0.1'
133+
}
134+
PUPPET
135+
end
146136
end
147137

148-
it_behaves_like 'an idempotent resource'
149-
150138
describe service(service_name) do
151139
it { is_expected.to be_running }
152140
end
@@ -169,23 +157,23 @@ class { 'rabbitmq':
169157
end
170158

171159
context 'ssl enabled' do
172-
let(:pp) do
173-
<<-EOS
174-
class { 'rabbitmq':
175-
service_manage => true,
176-
admin_enable => true,
177-
node_ip_address => '0.0.0.0',
178-
ssl_interface => '0.0.0.0',
179-
ssl => true,
180-
ssl_cacert => '/tmp/cacert.crt',
181-
ssl_cert => '/tmp/rabbitmq.crt',
182-
ssl_key => '/tmp/rabbitmq.key',
183-
}
184-
EOS
160+
it_behaves_like 'an idempotent resource' do
161+
let(:manifest) do
162+
<<-PUPPET
163+
class { 'rabbitmq':
164+
service_manage => true,
165+
admin_enable => true,
166+
node_ip_address => '0.0.0.0',
167+
ssl_interface => '0.0.0.0',
168+
ssl => true,
169+
ssl_cacert => '/tmp/cacert.crt',
170+
ssl_cert => '/tmp/rabbitmq.crt',
171+
ssl_key => '/tmp/rabbitmq.key',
172+
}
173+
PUPPET
174+
end
185175
end
186176

187-
it_behaves_like 'an idempotent resource'
188-
189177
describe service(service_name) do
190178
it { is_expected.to be_running }
191179
end
@@ -200,20 +188,20 @@ class { 'rabbitmq':
200188
end
201189

202190
context 'different management_ip_address and node_ip_address' do
203-
let(:pp) do
204-
<<-EOS
191+
it_behaves_like 'an idempotent resource' do
192+
let(:manifest) do
193+
<<-PUPPET
205194
class { 'rabbitmq':
206195
service_manage => true,
207196
port => 5672,
208197
admin_enable => true,
209198
node_ip_address => '0.0.0.0',
210199
management_ip_address => '127.0.0.1'
211200
}
212-
EOS
201+
PUPPET
202+
end
213203
end
214204

215-
it_behaves_like 'an idempotent resource'
216-
217205
describe service(service_name) do
218206
it { is_expected.to be_running }
219207
end

‎spec/acceptance/clustering_spec.rb

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ class { 'rabbitmq':
1414
erlang_cookie => 'TESTCOOKIE',
1515
wipe_db_on_cookie_change => false,
1616
}
17-
if $facts['os']['family'] == 'RedHat' {
18-
class { 'erlang': epel_enable => true}
19-
Class['erlang'] -> Class['rabbitmq']
20-
}
2117
EOS
2218

2319
apply_manifest(pp, expect_failures: true)
@@ -39,10 +35,6 @@ class { 'rabbitmq':
3935
erlang_cookie => 'TESTCOOKIE',
4036
wipe_db_on_cookie_change => true,
4137
}
42-
if $facts['os']['family'] == 'RedHat' {
43-
class { 'erlang': epel_enable => true}
44-
Class['erlang'] -> Class['rabbitmq']
45-
}
4638
EOS
4739

4840
apply_manifest(pp, catch_failures: true)
@@ -84,10 +76,6 @@ class { 'rabbitmq':
8476
environment_variables => { 'NODENAME' => 'rabbit@foobar' },
8577
erlang_cookie => 'TESTCOOKIE',
8678
}
87-
if $facts['os']['family'] == 'RedHat' {
88-
class { 'erlang': epel_enable => true}
89-
Class['erlang'] -> Class['rabbitmq']
90-
}
9179
EOS
9280

9381
apply_manifest(pp, expect_failures: true)

‎spec/acceptance/delete_guest_user_spec.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ class { 'rabbitmq':
1010
port => 5672,
1111
delete_guest_user => true,
1212
}
13-
if $facts['os']['family'] == 'RedHat' {
14-
class { 'erlang': epel_enable => true}
15-
Class['erlang'] -> Class['rabbitmq']
16-
}
1713
EOS
1814

1915
apply_manifest(pp, catch_failures: true)

‎spec/acceptance/parameter_spec.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
context 'create parameter resource' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
if $facts['os']['family'] == 'RedHat' {
10-
class { 'erlang': epel_enable => true }
11-
Class['erlang'] -> Class['rabbitmq']
12-
}
139
class { 'rabbitmq':
1410
service_manage => true,
1511
port => 5672,

‎spec/acceptance/policy_spec.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
context 'create policy resource' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
if $facts['os']['family'] == 'RedHat' {
10-
class { 'erlang': epel_enable => true }
11-
Class['erlang'] -> Class['rabbitmq']
12-
}
139
class { 'rabbitmq':
1410
service_manage => true,
1511
port => 5672,

‎spec/acceptance/queue_spec.rb

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
context 'create binding and queue resources when using default management port' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
if $facts['os']['family'] == 'RedHat' {
10-
class { 'erlang': epel_enable => true }
11-
Class['erlang'] -> Class['rabbitmq']
12-
}
139
class { 'rabbitmq':
1410
service_manage => true,
1511
port => 5672,
@@ -80,10 +76,6 @@ class { 'rabbitmq':
8076
context 'create multiple bindings when same source / destination / vhost but different routing keys' do
8177
it 'runs successfully' do
8278
pp = <<-EOS
83-
if $facts['os']['family'] == 'RedHat' {
84-
class { 'erlang': epel_enable => true }
85-
Class['erlang'] -> Class['rabbitmq']
86-
}
8779
class { 'rabbitmq':
8880
service_manage => true,
8981
port => 5672,
@@ -168,10 +160,6 @@ class { 'rabbitmq':
168160
context 'create binding and queue resources when using a non-default management port' do
169161
it 'runs successfully' do
170162
pp = <<-EOS
171-
if $facts['os']['family'] == 'RedHat' {
172-
class { 'erlang': epel_enable => true }
173-
Class['erlang'] -> Class['rabbitmq']
174-
}
175163
class { 'rabbitmq':
176164
service_manage => true,
177165
port => 5672,

‎spec/acceptance/rabbitmqadmin_spec.rb

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ class { 'rabbitmq':
1010
admin_enable => true,
1111
service_manage => true,
1212
}
13-
if $facts['os']['family'] == 'RedHat' {
14-
class { 'erlang': epel_enable => true}
15-
Class['erlang'] -> Class['rabbitmq']
16-
}
1713
EOS
1814

1915
apply_manifest(pp, catch_failures: true)
@@ -31,10 +27,6 @@ class { 'rabbitmq':
3127
admin_enable => true,
3228
service_manage => false,
3329
}
34-
if $facts['os']['family'] == 'RedHat' {
35-
class { 'erlang': epel_enable => true}
36-
Class['erlang'] -> Class['rabbitmq']
37-
}
3830
EOS
3931

4032
shell('rm -f /var/lib/rabbitmq/rabbitmqadmin')
@@ -55,10 +47,6 @@ class { 'rabbitmq':
5547
default_user => 'foobar',
5648
default_pass => 'bazblam',
5749
}
58-
if $facts['os']['family'] == 'RedHat' {
59-
class { 'erlang': epel_enable => true}
60-
Class['erlang'] -> Class['rabbitmq']
61-
}
6250
EOS
6351

6452
pp = <<-EOS
@@ -68,10 +56,6 @@ class { 'rabbitmq':
6856
default_user => 'foobar',
6957
default_pass => 'bazblam',
7058
}
71-
if $facts['os']['family'] == 'RedHat' {
72-
class { 'erlang': epel_enable => true}
73-
Class['erlang'] -> Class['rabbitmq']
74-
}
7559
EOS
7660

7761
shell('rm -f /var/lib/rabbitmq/rabbitmqadmin')

‎spec/acceptance/user_spec.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
context 'create user resource' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
if $facts['os']['family'] == 'RedHat' {
10-
class { 'erlang': epel_enable => true }
11-
Class['erlang'] -> Class['rabbitmq']
12-
}
139
class { 'rabbitmq':
1410
service_manage => true,
1511
port => 5672,

0 commit comments

Comments
 (0)