]> review.fuel-infra Code Review - puppet-modules/puppetlabs-firewall.git/commitdiff
MODULES-1612 - mask isn't supported on deb7
authorMorgan Haskel <morgan@puppetlabs.com>
Wed, 14 Jan 2015 20:58:07 +0000 (12:58 -0800)
committerMorgan Haskel <morgan@puppetlabs.com>
Wed, 14 Jan 2015 20:58:07 +0000 (12:58 -0800)
spec/acceptance/firewall_spec.rb

index 305fb6ca2e4d3917182460be54c1b72b8932d92b..8f17695428c20568268d435e9d71c456ee7abd8e 100644 (file)
@@ -1487,9 +1487,11 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
         end
       end
 
-      describe 'mask' do
-        it 'applies' do
-          pp = <<-EOS
+      # mask isn't supported on deb7
+      if default['platform'] !~ /debian-7/
+        describe 'mask' do
+          it 'applies' do
+            pp = <<-EOS
             class { '::firewall': }
             firewall { '613 - test':
               recent => 'update',
@@ -1501,14 +1503,15 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
               mask => 'ffff::',
               provider => 'ip6tables',
             }
-          EOS
+            EOS
 
-          apply_manifest(pp, :catch_failures => true)
-        end
+            apply_manifest(pp, :catch_failures => true)
+          end
 
-        it 'should contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to match(/-A FORWARD -p tcp -m comment --comment "613 - test" -m recent --update --seconds 60 --name test --mask ffff:: --rsource -j DROP/)
+          it 'should contain the rule' do
+            shell('ip6tables-save') do |r|
+              expect(r.stdout).to match(/-A FORWARD -p tcp -m comment --comment "613 - test" -m recent --update --seconds 60 --name test --mask ffff:: --rsource -j DROP/)
+            end
           end
         end
       end