Merge pull request voxpupuli#369 from roidelapluie/verb

Reduce logs verbosity

CHANGELOG.md

@@ -7,7 +7,7 @@
 - Add autorequirement between cs\_location and cs\_primitives/cs\_clone (#359)
 - Add autorequirement between cs\_clone and cs\_primitive (#357, #365)
 - Add "Managed By Puppet" header to corosync.conf (#360)
-- Improve tests (#335, #337, #331, #328, #364)
+- Improve tests (#335, #337, #331, #328, #364, #369)
 - Modulesync (#330)
 
 ### Backward incompatible changes

spec/acceptance/basic_spec.rb

@@ -40,7 +40,7 @@ class { 'corosync':
     EOS
 
     apply_manifest(pp, catch_failures: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
   end
 
   describe service('corosync') do

spec/acceptance/corosync_class_spec.rb

@@ -40,7 +40,7 @@ class { 'corosync':
     EOS
 
     apply_manifest(pp, catch_failures: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
   end
 
   describe service('corosync') do

spec/acceptance/cs_colocation_spec.rb

@@ -58,7 +58,7 @@ class { 'corosync':
     EOS
 
     apply_manifest(pp, catch_failures: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
   end
 
   describe service('corosync') do

spec/acceptance/cs_commit_spec.rb

@@ -72,7 +72,7 @@ class { 'corosync':
     EOS
 
     apply_manifest(pp, catch_failures: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
   end
 
   describe service('corosync') do

spec/acceptance/cs_location_spec.rb

@@ -48,7 +48,7 @@ class { 'corosync':
     EOS
 
     apply_manifest(pp, catch_failures: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
   end
 
   describe service('corosync') do
@@ -64,7 +64,7 @@ class { 'corosync':
       }
     EOS
     apply_manifest(pp, catch_failures: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
     shell('cibadmin --query | grep duncan_vip_there') do |r|
       expect(r.stdout).to match(%r{rsc_location})
     end
@@ -77,7 +77,7 @@ class { 'corosync':
       }
     EOS
     apply_manifest(pp, catch_failures: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
     assert_raises(Beaker::Host::CommandFailure) do
       shell('cibadmin --query | grep duncan_vip_there')
     end
@@ -93,7 +93,7 @@ class { 'corosync':
       }
     EOS
     apply_manifest(pp, catch_failures: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
     shell('cibadmin --query | grep duncan_vip_there') do |r|
       expect(r.stdout).to match(%r{rsc_location})
     end
@@ -135,7 +135,7 @@ class { 'corosync':
         }
       EOS
       apply_manifest(pp, catch_failures: true, debug: true, trace: true)
-      apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+      apply_manifest(pp, catch_changes: true, debug: false, trace: true)
     end
 
     # attribute order in XML might be non-deterministic
@@ -194,7 +194,7 @@ class { 'corosync':
         }
       EOS
       apply_manifest(pp, catch_failures: true, debug: true, trace: true)
-      apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+      apply_manifest(pp, catch_changes: true, debug: false, trace: true)
     end
 
     # attribute order in XML might be non-deterministic

spec/acceptance/cs_order_spec.rb

@@ -55,7 +55,7 @@ class { 'corosync':
     EOS
 
     apply_manifest(pp, expect_changes: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
   end
 
   describe service('corosync') do
@@ -70,7 +70,7 @@ class { 'corosync':
       }
     EOS
     apply_manifest(pp, expect_changes: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
     shell('cibadmin --query | grep first_then_two') do |r|
       expect(r.stdout).to match(%r{rsc_order})
     end
@@ -115,7 +115,7 @@ class { 'corosync':
       }
     EOS
     apply_manifest(pp, expect_changes: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
     assert_raises(Beaker::Host::CommandFailure) do
       shell('cibadmin --query | grep first_then_two')
     end
@@ -130,7 +130,7 @@ class { 'corosync':
       }
     EOS
     apply_manifest(pp, expect_changes: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
     shell('cibadmin --query | grep one_then_two_complex') do |r|
       expect(r.stdout).to match(%r{rsc_order})
     end

spec/acceptance/cs_primitive_spec.rb

@@ -55,7 +55,7 @@ class { 'corosync':
     EOS
 
     apply_manifest(pp, catch_failures: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
   end
 
   describe service('corosync') do
@@ -90,7 +90,7 @@ class { 'corosync':
     }
     EOS
     apply_manifest(pp, expect_changes: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
     shell('cibadmin --query') do |r|
       expect(r.stdout).to match(%r{haproxy_vip})
     end
@@ -107,12 +107,12 @@ class { 'corosync':
         }
     EOS
     apply_manifest(pp, expect_changes: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
 
     shell('crm_resource -r test_stop -m -p target-role -v Stopped')
 
     apply_manifest(pp, expect_changes: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
   end
 
   it 'respects unmanaged_metadata' do
@@ -127,11 +127,11 @@ class { 'corosync':
         }
     EOS
     apply_manifest(pp, expect_changes: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
 
     shell('crm_resource -r test_stop2 -m -p target-role -v Stopped')
 
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
 
     pp = <<-EOS
         cs_primitive { 'test_stop2':
@@ -144,7 +144,7 @@ class { 'corosync':
     EOS
 
     apply_manifest(pp, expect_changes: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
   end
 
   it 'accepts 2 metadata names in unmanaged_metadata' do
@@ -159,7 +159,7 @@ class { 'corosync':
         }
     EOS
     apply_manifest(pp, expect_changes: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
   end
 
   it 'does set is-managed in test_md' do
@@ -186,7 +186,7 @@ class { 'corosync':
         }
     EOS
 
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
   end
 
   it 'does not delete or change is-managed if it is in unmanaged_metadata' do
@@ -214,7 +214,7 @@ class { 'corosync':
     EOS
 
     apply_manifest(pp, expect_changes: true, debug: true, trace: true)
-    apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+    apply_manifest(pp, catch_changes: true, debug: false, trace: true)
   end
 
   it 'does delete is-managed because it is no longer in unmanaged_metadata' do

spec/acceptance/cs_rsc_defaults_spec.rb

@@ -42,7 +42,7 @@ class { 'corosync':
       EOS
 
       apply_manifest(pp, catch_failures: true, debug: true, trace: true)
-      apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+      apply_manifest(pp, catch_changes: true, debug: false, trace: true)
 
       shell('cibadmin --query') do |r|
         expect(r.stdout).to match(%r{resource-stickiness.*98898})
@@ -56,7 +56,7 @@ class { 'corosync':
           }
       EOS
       apply_manifest(pp, expect_changes: true, debug: true, trace: true)
-      apply_manifest(pp, catch_changes: true, debug: true, trace: true)
+      apply_manifest(pp, catch_changes: true, debug: false, trace: true)
 
       shell('cibadmin --query') do |r|
         expect(r.stdout).not_to match(%r{resource-stickiness.*98898})