Skip to content

Commit 16b15f6

Browse files
bastelfreakbastelfreak
authored
Merge pull request voxpupuli#369 from roidelapluie/verb
Reduce logs verbosity
2 parents 3f56c39 + 2c66f92 commit 16b15f6

9 files changed

+27
-27
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- Add autorequirement between cs\_location and cs\_primitives/cs\_clone (#359)
88
- Add autorequirement between cs\_clone and cs\_primitive (#357, #365)
99
- Add "Managed By Puppet" header to corosync.conf (#360)
10-
- Improve tests (#335, #337, #331, #328, #364)
10+
- Improve tests (#335, #337, #331, #328, #364, #369)
1111
- Modulesync (#330)
1212

1313
### Backward incompatible changes

‎spec/acceptance/basic_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class { 'corosync':
4040
EOS
4141

4242
apply_manifest(pp, catch_failures: true, debug: true, trace: true)
43-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
43+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
4444
end
4545

4646
describe service('corosync') do

‎spec/acceptance/corosync_class_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class { 'corosync':
4040
EOS
4141

4242
apply_manifest(pp, catch_failures: true, debug: true, trace: true)
43-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
43+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
4444
end
4545

4646
describe service('corosync') do

‎spec/acceptance/cs_colocation_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class { 'corosync':
5858
EOS
5959

6060
apply_manifest(pp, catch_failures: true, debug: true, trace: true)
61-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
61+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
6262
end
6363

6464
describe service('corosync') do

‎spec/acceptance/cs_commit_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class { 'corosync':
7272
EOS
7373

7474
apply_manifest(pp, catch_failures: true, debug: true, trace: true)
75-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
75+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
7676
end
7777

7878
describe service('corosync') do

‎spec/acceptance/cs_location_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class { 'corosync':
4848
EOS
4949

5050
apply_manifest(pp, catch_failures: true, debug: true, trace: true)
51-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
51+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
5252
end
5353

5454
describe service('corosync') do
@@ -64,7 +64,7 @@ class { 'corosync':
6464
}
6565
EOS
6666
apply_manifest(pp, catch_failures: true, debug: true, trace: true)
67-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
67+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
6868
shell('cibadmin --query | grep duncan_vip_there') do |r|
6969
expect(r.stdout).to match(%r{rsc_location})
7070
end
@@ -77,7 +77,7 @@ class { 'corosync':
7777
}
7878
EOS
7979
apply_manifest(pp, catch_failures: true, debug: true, trace: true)
80-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
80+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
8181
assert_raises(Beaker::Host::CommandFailure) do
8282
shell('cibadmin --query | grep duncan_vip_there')
8383
end
@@ -93,7 +93,7 @@ class { 'corosync':
9393
}
9494
EOS
9595
apply_manifest(pp, catch_failures: true, debug: true, trace: true)
96-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
96+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
9797
shell('cibadmin --query | grep duncan_vip_there') do |r|
9898
expect(r.stdout).to match(%r{rsc_location})
9999
end
@@ -135,7 +135,7 @@ class { 'corosync':
135135
}
136136
EOS
137137
apply_manifest(pp, catch_failures: true, debug: true, trace: true)
138-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
138+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
139139
end
140140

141141
# attribute order in XML might be non-deterministic
@@ -194,7 +194,7 @@ class { 'corosync':
194194
}
195195
EOS
196196
apply_manifest(pp, catch_failures: true, debug: true, trace: true)
197-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
197+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
198198
end
199199

200200
# attribute order in XML might be non-deterministic

‎spec/acceptance/cs_order_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class { 'corosync':
5555
EOS
5656

5757
apply_manifest(pp, expect_changes: true, debug: true, trace: true)
58-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
58+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
5959
end
6060

6161
describe service('corosync') do
@@ -70,7 +70,7 @@ class { 'corosync':
7070
}
7171
EOS
7272
apply_manifest(pp, expect_changes: true, debug: true, trace: true)
73-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
73+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
7474
shell('cibadmin --query | grep first_then_two') do |r|
7575
expect(r.stdout).to match(%r{rsc_order})
7676
end
@@ -115,7 +115,7 @@ class { 'corosync':
115115
}
116116
EOS
117117
apply_manifest(pp, expect_changes: true, debug: true, trace: true)
118-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
118+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
119119
assert_raises(Beaker::Host::CommandFailure) do
120120
shell('cibadmin --query | grep first_then_two')
121121
end
@@ -130,7 +130,7 @@ class { 'corosync':
130130
}
131131
EOS
132132
apply_manifest(pp, expect_changes: true, debug: true, trace: true)
133-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
133+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
134134
shell('cibadmin --query | grep one_then_two_complex') do |r|
135135
expect(r.stdout).to match(%r{rsc_order})
136136
end

‎spec/acceptance/cs_primitive_spec.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class { 'corosync':
5555
EOS
5656

5757
apply_manifest(pp, catch_failures: true, debug: true, trace: true)
58-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
58+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
5959
end
6060

6161
describe service('corosync') do
@@ -90,7 +90,7 @@ class { 'corosync':
9090
}
9191
EOS
9292
apply_manifest(pp, expect_changes: true, debug: true, trace: true)
93-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
93+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
9494
shell('cibadmin --query') do |r|
9595
expect(r.stdout).to match(%r{haproxy_vip})
9696
end
@@ -107,12 +107,12 @@ class { 'corosync':
107107
}
108108
EOS
109109
apply_manifest(pp, expect_changes: true, debug: true, trace: true)
110-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
110+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
111111

112112
shell('crm_resource -r test_stop -m -p target-role -v Stopped')
113113

114114
apply_manifest(pp, expect_changes: true, debug: true, trace: true)
115-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
115+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
116116
end
117117

118118
it 'respects unmanaged_metadata' do
@@ -127,11 +127,11 @@ class { 'corosync':
127127
}
128128
EOS
129129
apply_manifest(pp, expect_changes: true, debug: true, trace: true)
130-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
130+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
131131

132132
shell('crm_resource -r test_stop2 -m -p target-role -v Stopped')
133133

134-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
134+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
135135

136136
pp = <<-EOS
137137
cs_primitive { 'test_stop2':
@@ -144,7 +144,7 @@ class { 'corosync':
144144
EOS
145145

146146
apply_manifest(pp, expect_changes: true, debug: true, trace: true)
147-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
147+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
148148
end
149149

150150
it 'accepts 2 metadata names in unmanaged_metadata' do
@@ -159,7 +159,7 @@ class { 'corosync':
159159
}
160160
EOS
161161
apply_manifest(pp, expect_changes: true, debug: true, trace: true)
162-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
162+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
163163
end
164164

165165
it 'does set is-managed in test_md' do
@@ -186,7 +186,7 @@ class { 'corosync':
186186
}
187187
EOS
188188

189-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
189+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
190190
end
191191

192192
it 'does not delete or change is-managed if it is in unmanaged_metadata' do
@@ -214,7 +214,7 @@ class { 'corosync':
214214
EOS
215215

216216
apply_manifest(pp, expect_changes: true, debug: true, trace: true)
217-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
217+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
218218
end
219219

220220
it 'does delete is-managed because it is no longer in unmanaged_metadata' do

‎spec/acceptance/cs_rsc_defaults_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class { 'corosync':
4242
EOS
4343

4444
apply_manifest(pp, catch_failures: true, debug: true, trace: true)
45-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
45+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
4646

4747
shell('cibadmin --query') do |r|
4848
expect(r.stdout).to match(%r{resource-stickiness.*98898})
@@ -56,7 +56,7 @@ class { 'corosync':
5656
}
5757
EOS
5858
apply_manifest(pp, expect_changes: true, debug: true, trace: true)
59-
apply_manifest(pp, catch_changes: true, debug: true, trace: true)
59+
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
6060

6161
shell('cibadmin --query') do |r|
6262
expect(r.stdout).not_to match(%r{resource-stickiness.*98898})

0 commit comments

Comments
 (0)