Only catch changes if not EL5 due to selinux warning issue.

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 4a9751a6c2e4e4e3848383c1545d89410fee17a6..0c74f97792192178d9e8ae163eee220535444e22 100644 (file)
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -6,7 +6,9 @@ describe "firewall class:", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfa
 
     # Run it twice and test for idempotency
     apply_manifest(pp, :catch_failures => true)
-    expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+    if do_catch_changes
+      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+    end
   end
 
   it 'ensure => stopped:' do
@@ -14,7 +16,9 @@ describe "firewall class:", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfa
 
     # Run it twice and test for idempotency
     apply_manifest(pp, :catch_failures => true)
-    expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+    if do_catch_changes
+      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+    end
   end
 
   it 'ensure => running:' do
@@ -22,6 +26,8 @@ describe "firewall class:", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfa
 
     # Run it twice and test for idempotency
     apply_manifest(pp, :catch_failures => true)
-    expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+    if do_catch_changes
+      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+    end
   end
 end

diff --git a/spec/acceptance/firewall_bridging_spec.rb b/spec/acceptance/firewall_bridging_spec.rb
index 96b013e4f520e008e748cd3a385d49f0fb0b8a02..6b48f24852b5b9ec475a3f22fbeca42808aa3fea 100644 (file)
--- a/spec/acceptance/firewall_bridging_spec.rb
+++ b/spec/acceptance/firewall_bridging_spec.rb
@@ -26,7 +26,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
           EOS
 
           apply_manifest(pp, :catch_failures => true)
-          apply_manifest(pp, :catch_changes => true)
+          apply_manifest(pp, :catch_changes => do_catch_changes)
         end
 
         it 'should contain the rule' do
@@ -50,7 +50,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
           EOS
 
           apply_manifest(pp, :catch_failures => true)
-          apply_manifest(pp, :catch_changes => true)
+          apply_manifest(pp, :catch_changes => do_catch_changes)
         end
 
         it 'should contain the rule' do
@@ -75,7 +75,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
           EOS
 
           apply_manifest(pp, :catch_failures => true)
-          apply_manifest(pp, :catch_changes => true)
+          apply_manifest(pp, :catch_changes => do_catch_changes)
         end
 
         it 'should contain the rule' do
@@ -99,7 +99,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
           EOS
 
           apply_manifest(pp, :catch_failures => true)
-          apply_manifest(pp, :catch_changes => true)
+          apply_manifest(pp, :catch_changes => do_catch_changes)
         end
 
         it 'should contain the rule' do
@@ -124,7 +124,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
           EOS
 
           apply_manifest(pp, :catch_failures => true)
-          apply_manifest(pp, :catch_changes => true)
+          apply_manifest(pp, :catch_changes => do_catch_changes)
         end
 
         it 'should contain the rule' do
@@ -149,7 +149,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
           EOS
 
           apply_manifest(pp, :catch_failures => true)
-          apply_manifest(pp, :catch_changes => true)
+          apply_manifest(pp, :catch_changes => do_catch_changes)
         end
 
         it 'should contain the rule' do
@@ -175,7 +175,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
           EOS
 
           apply_manifest(pp, :catch_failures => true)
-          apply_manifest(pp, :catch_changes => true)
+          apply_manifest(pp, :catch_changes => do_catch_changes)
         end
 
         it 'should contain the rule' do
@@ -205,7 +205,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
             EOS
 
             apply_manifest(pp, :catch_failures => true)
-            apply_manifest(pp, :catch_changes => true)
+            apply_manifest(pp, :catch_changes => do_catch_changes)
           end
 
           it 'should contain the rule' do
@@ -230,7 +230,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
             EOS
 
             apply_manifest(pp, :catch_failures => true)
-            apply_manifest(pp, :catch_changes => true)
+            apply_manifest(pp, :catch_changes => do_catch_changes)
           end
 
           it 'should contain the rule' do
@@ -256,7 +256,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
             EOS
 
             apply_manifest(pp, :catch_failures => true)
-            apply_manifest(pp, :catch_changes => true)
+            apply_manifest(pp, :catch_changes => do_catch_changes)
           end
 
           it 'should contain the rule' do
@@ -281,7 +281,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
             EOS
 
             apply_manifest(pp, :catch_failures => true)
-            apply_manifest(pp, :catch_changes => true)
+            apply_manifest(pp, :catch_changes => do_catch_changes)
           end
 
           it 'should contain the rule' do
@@ -307,7 +307,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
             EOS
 
             apply_manifest(pp, :catch_failures => true)
-            apply_manifest(pp, :catch_changes => true)
+            apply_manifest(pp, :catch_changes => do_catch_changes)
           end
 
           it 'should contain the rule' do
@@ -333,7 +333,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
             EOS
 
             apply_manifest(pp, :catch_failures => true)
-            apply_manifest(pp, :catch_changes => true)
+            apply_manifest(pp, :catch_changes => do_catch_changes)
           end
 
           it 'should contain the rule' do
@@ -360,7 +360,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
             EOS
 
             apply_manifest(pp, :catch_failures => true)
-            apply_manifest(pp, :catch_changes => true)
+            apply_manifest(pp, :catch_changes => do_catch_changes)
           end
 
           it 'should contain the rule' do

diff --git a/spec/acceptance/firewall_iptmodules_spec.rb b/spec/acceptance/firewall_iptmodules_spec.rb
index 6023ff930007661c849a8f360ac96abc9681d507..be0c5db00d26d5cf6265fe9a510f76f03d45af08 100644 (file)
--- a/spec/acceptance/firewall_iptmodules_spec.rb
+++ b/spec/acceptance/firewall_iptmodules_spec.rb
@@ -34,7 +34,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
         EOS
 
         apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
       end
 
       it 'should contain the rule' do
@@ -62,7 +62,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
         EOS
 
         apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
       end
 
       it 'should contain the rule' do
@@ -99,7 +99,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
             EOS
 
             apply_manifest(pp, :catch_failures => true)
-            apply_manifest(pp, :catch_changes => true)
+            apply_manifest(pp, :catch_changes => do_catch_changes)
           end
 
           it 'should contain the rule' do
@@ -128,7 +128,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
             EOS
 
             apply_manifest(pp, :catch_failures => true)
-            apply_manifest(pp, :catch_changes => true)
+            apply_manifest(pp, :catch_changes => do_catch_changes)
           end
 
           it 'should contain the rule' do
@@ -163,7 +163,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
             EOS
 
             apply_manifest(pp, :catch_failures => true)
-            apply_manifest(pp, :catch_changes => true)
+            apply_manifest(pp, :catch_changes => do_catch_changes)
           end
 
           it 'should contain the rule' do
@@ -191,7 +191,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
             EOS
 
             apply_manifest(pp, :catch_failures => true)
-            apply_manifest(pp, :catch_changes => true)
+            apply_manifest(pp, :catch_changes => do_catch_changes)
           end
 
           it 'should contain the rule' do

diff --git a/spec/acceptance/firewall_spec.rb b/spec/acceptance/firewall_spec.rb
index 8576ffb0c3bfb04caee3c3edecb1417efc9e492a..f131cfbc8d60db73ac9e617ec1269b31724ce23e 100644 (file)
--- a/spec/acceptance/firewall_spec.rb
+++ b/spec/acceptance/firewall_spec.rb
@@ -116,7 +116,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
         EOS
 
         apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
       end
 
       it 'should contain the rule' do
@@ -139,7 +139,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
         EOS
 
         apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
       end
 
       it 'should contain the rule' do
@@ -189,7 +189,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
         EOS
 
         apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
       end
 
       it 'should contain the rule' do
@@ -239,7 +239,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
         EOS
 
         apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
       end
 
       it 'should contain the rule' do
@@ -262,7 +262,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
         EOS
 
         apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
       end
 
       it 'should contain the rule' do
@@ -312,7 +312,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
         EOS
 
         apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
       end
 
       it 'should contain the rule' do
@@ -584,7 +584,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
           EOS
 
           apply_manifest(pp, :catch_failures => true)
-          apply_manifest(pp, :catch_changes => true)
+          apply_manifest(pp, :catch_changes => do_catch_changes)
         end
 
         it 'should contain the rule' do
@@ -920,7 +920,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
           EOS
 
           apply_manifest(pp, :catch_failures => true)
-          apply_manifest(pp, :catch_changes => true)
+          apply_manifest(pp, :catch_changes => do_catch_changes)
         end
 
         it 'should contain the rule' do
@@ -1199,7 +1199,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
           EOS
 
           apply_manifest(pp, :catch_failures => true)
-          apply_manifest(pp, :catch_changes => true)
+          apply_manifest(pp, :catch_changes => do_catch_changes)
         end
 
         it 'should contain the rule' do
@@ -1251,7 +1251,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
           EOS
 
           apply_manifest(pp, :catch_failures => true)
-          apply_manifest(pp, :catch_changes => true)
+          apply_manifest(pp, :catch_changes => do_catch_changes)
         end
 
         it 'should contain the rule' do
@@ -1609,7 +1609,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
               EOS
 
               apply_manifest(pp, :catch_failures => true)
-              apply_manifest(pp, :catch_changes => true)
+              apply_manifest(pp, :catch_changes => do_catch_changes)
             end
 
             it 'should contain the rule' do
@@ -1632,7 +1632,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
               EOS
 
               apply_manifest(pp, :catch_failures => true)
-              apply_manifest(pp, :catch_changes => true)
+              apply_manifest(pp, :catch_changes => do_catch_changes)
             end
 
             it 'should contain the rule' do

diff --git a/spec/acceptance/firewall_time_spec.rb b/spec/acceptance/firewall_time_spec.rb
index 61365bb6921a0695b3f08bf61dd4069815055380..e6ea34e3b190e4c98506921b48409ae5f81c8557 100644 (file)
--- a/spec/acceptance/firewall_time_spec.rb
+++ b/spec/acceptance/firewall_time_spec.rb
@@ -30,7 +30,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
           EOS
 
           apply_manifest(pp, :catch_failures => true)
-          apply_manifest(pp, :catch_changes => true)
+          apply_manifest(pp, :catch_changes => do_catch_changes)
         end
 
         it 'should contain the rule' do
@@ -63,7 +63,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
           EOS
 
           apply_manifest(pp, :catch_failures => true)
-          apply_manifest(pp, :catch_changes => true)
+          apply_manifest(pp, :catch_changes => do_catch_changes)
         end
 
         it 'should contain the rule' do

diff --git a/spec/acceptance/firewall_uid_spec.rb b/spec/acceptance/firewall_uid_spec.rb
index 3a976f92ac5907ec259985e5af40e27be3f30496..ce45333e9488969c3b9fe060c5a257fe4f582e21 100644 (file)
--- a/spec/acceptance/firewall_uid_spec.rb
+++ b/spec/acceptance/firewall_uid_spec.rb
@@ -25,7 +25,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
         EOS
 
         apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
       end
 
       it 'should contain the rule' do
@@ -48,7 +48,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
         EOS
 
         apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
       end
 
       it 'should contain the rule' do
@@ -71,7 +71,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
         EOS
 
         apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
       end
 
       it 'should contain the rule' do
@@ -94,7 +94,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
         EOS
 
         apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
       end
 
       it 'should contain the rule' do

diff --git a/spec/acceptance/firewallchain_spec.rb b/spec/acceptance/firewallchain_spec.rb
index f70d9cefd719de34f4eadf84b28d693341cc02d5..eaf71ccd33ff871455b0bdffab1f38e6316d6b31 100644 (file)
--- a/spec/acceptance/firewallchain_spec.rb
+++ b/spec/acceptance/firewallchain_spec.rb
@@ -14,7 +14,7 @@ describe 'puppet resource firewallchain command:', :unless => UNSUPPORTED_PLATFO
         EOS
         # Run it twice and test for idempotency
         apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
       end
 
       it 'finds the chain' do
@@ -33,7 +33,7 @@ describe 'puppet resource firewallchain command:', :unless => UNSUPPORTED_PLATFO
         EOS
         # Run it twice and test for idempotency
         apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
       end
 
       it 'fails to find the chain' do
@@ -60,7 +60,7 @@ describe 'puppet resource firewallchain command:', :unless => UNSUPPORTED_PLATFO
   #    EOS
   #    # Run it twice and test for idempotency
   #    apply_manifest(pp, :catch_failures => true)
-  #    apply_manifest(pp, :catch_changes => true)
+  #    apply_manifest(pp, :catch_changes => do_catch_changes)
   #  end
   #end
 
@@ -81,7 +81,7 @@ describe 'puppet resource firewallchain command:', :unless => UNSUPPORTED_PLATFO
   #      expect(r.stdout).to_not match(/removed/)
   #      expect(r.stderr).to eq('')
   #    end
-  #    apply_manifest(pp, :catch_changes => true)
+  #    apply_manifest(pp, :catch_changes => do_catch_changes)
   #  end
 
   #  it 'still has the rule' do
@@ -94,7 +94,7 @@ describe 'puppet resource firewallchain command:', :unless => UNSUPPORTED_PLATFO
   #      }
   #    EOS
   #    # Run it twice and test for idempotency
-  #    apply_manifest(pp, :catch_changes => true)
+  #    apply_manifest(pp, :catch_changes => do_catch_changes)
   #  end
   #end
 
@@ -112,7 +112,7 @@ describe 'puppet resource firewallchain command:', :unless => UNSUPPORTED_PLATFO
         EOS
         # Run it twice and test for idempotency
         apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
       end
 
       it 'finds the chain' do

diff --git a/spec/acceptance/invert_spec.rb b/spec/acceptance/invert_spec.rb
index ade319ffba0528f39bec9d13ecf78bd89c2707b6..f8ce25efffd90c63bf05717bed7c703ddcabd73c 100644 (file)
--- a/spec/acceptance/invert_spec.rb
+++ b/spec/acceptance/invert_spec.rb
@@ -25,7 +25,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
       EOS
 
       apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes  => true)
+      apply_manifest(pp, :catch_changes => do_catch_changes)
     end
 
     it 'should contain the rules' do

diff --git a/spec/acceptance/ip6_fragment_spec.rb b/spec/acceptance/ip6_fragment_spec.rb
index 3e44f8723e6d3154b1ea5d049c17f0e58a6262e9..86c285844e654715450bc44eef9c9dc4a8883f7d 100644 (file)
--- a/spec/acceptance/ip6_fragment_spec.rb
+++ b/spec/acceptance/ip6_fragment_spec.rb
@@ -37,7 +37,7 @@ else
         EOS
 
         apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
 
         shell('ip6tables-save') do |r|
           expect(r.stdout).to match(/#{line_match}/)
@@ -56,7 +56,7 @@ else
             }
         EOS
 
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, :catch_changes => do_catch_changes)
 
         shell('ip6tables-save') do |r|
           expect(r.stdout).to match(/#{line_match}/)

diff --git a/spec/acceptance/isfragment_spec.rb b/spec/acceptance/isfragment_spec.rb
index a4b65e76e82f1b76ba41dc40492d46d0e5ccd185..f48f27234c80d05a2544f2e619a7589425d839fd 100644 (file)
--- a/spec/acceptance/isfragment_spec.rb
+++ b/spec/acceptance/isfragment_spec.rb
@@ -17,7 +17,7 @@ describe 'firewall isfragment property', :unless => UNSUPPORTED_PLATFORMS.includ
       EOS
 
       apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
+      apply_manifest(pp, :catch_changes => do_catch_changes)
 
       shell('iptables-save') do |r|
         expect(r.stdout).to match(/#{line_match}/)
@@ -35,7 +35,7 @@ describe 'firewall isfragment property', :unless => UNSUPPORTED_PLATFORMS.includ
           }
       EOS
 
-      apply_manifest(pp, :catch_changes => true)
+      apply_manifest(pp, :catch_changes => do_catch_changes)
 
       shell('iptables-save') do |r|
         expect(r.stdout).to match(/#{line_match}/)

diff --git a/spec/acceptance/purge_spec.rb b/spec/acceptance/purge_spec.rb
index ab37b2cb206aa691c070fb5efd6c46666dfa3b58..2d8722077591236e2f728f25d0b03efd97dbf7f9 100644 (file)
--- a/spec/acceptance/purge_spec.rb
+++ b/spec/acceptance/purge_spec.rb
@@ -71,7 +71,7 @@ describe "purge tests:", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamil
         }
       EOS
 
-      apply_manifest(pp, :catch_changes => true)
+      apply_manifest(pp, :catch_changes => do_catch_changes)
     end
 
     it 'ignores specified rules' do
@@ -85,7 +85,7 @@ describe "purge tests:", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamil
         }
       EOS
 
-      apply_manifest(pp, :catch_changes => true)
+      apply_manifest(pp, :catch_changes => do_catch_changes)
     end
 
     it 'adds managed rules with ignored rules' do
@@ -167,7 +167,7 @@ describe "purge tests:", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamil
         }
       EOS
 
-      apply_manifest(pp, :catch_changes => true)
+      apply_manifest(pp, :catch_changes => do_catch_changes)
     end
 
     it 'ignores specified rules' do
@@ -181,7 +181,7 @@ describe "purge tests:", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamil
         }
       EOS
 
-      apply_manifest(pp, :catch_changes => true)
+      apply_manifest(pp, :catch_changes => do_catch_changes)
     end
 
     it 'adds managed rules with ignored rules' do

diff --git a/spec/acceptance/rules_spec.rb b/spec/acceptance/rules_spec.rb
index b91e11e478282989319924aeccd83f068ab99017..153762a3d7ea7a9215b66812ad784e131e472efb 100644 (file)
--- a/spec/acceptance/rules_spec.rb
+++ b/spec/acceptance/rules_spec.rb
@@ -242,7 +242,7 @@ describe 'complex ruleset 2' do
 
     # Run it twice and test for idempotency
     apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
+    apply_manifest(pp, :catch_changes => do_catch_changes)
   end
 
   it 'contains appropriate rules' do

diff --git a/spec/acceptance/standard_usage_spec.rb b/spec/acceptance/standard_usage_spec.rb
index e585bb746f6ee68db653d5af833e1ec75ff905a7..afc0c42adee03067636d6e96ead2b892ec26d451 100644 (file)
--- a/spec/acceptance/standard_usage_spec.rb
+++ b/spec/acceptance/standard_usage_spec.rb
@@ -55,6 +55,6 @@ describe 'standard usage tests:', :unless => UNSUPPORTED_PLATFORMS.include?(fact
 
     # Run it twice and test for idempotency
     apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
+    apply_manifest(pp, :catch_changes => do_catch_changes)
   end
 end

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 383e34bf7aec769250c3a2b6df8b10cb86dad748..44b5f8da579a8b460b0e41451ea373932535a190 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -13,6 +13,14 @@ def ip6tables_flush_all_tables
   end
 end
 
+def do_catch_changes
+  if default['platform'] =~ /el-5/
+    return false
+  else
+    return true
+  end
+end
+
 run_puppet_install_helper
 
 UNSUPPORTED_PLATFORMS = ['windows','Solaris','Darwin']