From afe3359bd49624b606fdb2ed0bd39ef1ad38bddb Mon Sep 17 00:00:00 2001 From: Morgan Haskel Date: Wed, 14 Jan 2015 12:58:07 -0800 Subject: [PATCH] MODULES-1612 - mask isn't supported on deb7 --- spec/acceptance/firewall_spec.rb | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/spec/acceptance/firewall_spec.rb b/spec/acceptance/firewall_spec.rb index 305fb6c..8f17695 100644 --- a/spec/acceptance/firewall_spec.rb +++ b/spec/acceptance/firewall_spec.rb @@ -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 -- 2.45.2