From 9642742dbcafab23cf718d27d2411ac6bd1ed34c Mon Sep 17 00:00:00 2001 From: Jonathan Tripathy Date: Fri, 24 Jul 2015 01:03:28 +0100 Subject: [PATCH] More test exclusion logic fixes --- spec/acceptance/firewall_spec.rb | 2 +- spec/acceptance/ip6_fragment_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/acceptance/firewall_spec.rb b/spec/acceptance/firewall_spec.rb index 4ce7bb4..aa888dc 100644 --- a/spec/acceptance/firewall_spec.rb +++ b/spec/acceptance/firewall_spec.rb @@ -2217,7 +2217,7 @@ describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami it 'should contain the rule' do shell('iptables-save') do |r| - if (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '5') or (fact('osfamily') == 'SLES' and fact('operatingsystemmajrelease') == '10') + if (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '5') or default['platform'] =~ /sles-10/ expect(r.stdout).to match(/-A INPUT -s 10.1.5.28 -p tcp -m mac --mac-source 0A:1B:3C:4D:5E:6F -m comment --comment "610 - test"/) else expect(r.stdout).to match(/-A INPUT -s 10.1.5.28\/(32|255\.255\.255\.255) -p tcp -m mac --mac-source 0A:1B:3C:4D:5E:6F -m comment --comment "610 - test"/) diff --git a/spec/acceptance/ip6_fragment_spec.rb b/spec/acceptance/ip6_fragment_spec.rb index 5a34ebf..64728ed 100644 --- a/spec/acceptance/ip6_fragment_spec.rb +++ b/spec/acceptance/ip6_fragment_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper_acceptance' -if default['platform'] =~ /el-5/ and default['platform'] =~ /sles-10/ +if default['platform'] =~ /el-5/ or default['platform'] =~ /sles-10/ describe "firewall ip6tables doesn't work on 1.3.5 because --comment is missing", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do before :all do ip6tables_flush_all_tables -- 2.45.2