From aea1e52507f17eb4432ee1750eafd73786ca96e3 Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Fri, 21 Feb 2014 12:55:20 -0800 Subject: [PATCH] Fix logic for supported socket platforms --- spec/acceptance/params_spec.rb | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/spec/acceptance/params_spec.rb b/spec/acceptance/params_spec.rb index 261b4770e..d2948eed8 100644 --- a/spec/acceptance/params_spec.rb +++ b/spec/acceptance/params_spec.rb @@ -20,23 +20,19 @@ def pp(params) pm end - it 'test various params' do + it 'test various params', :unless => default['platform'].match(/el-5/) do iptables_flush_all_tables - unless (fact('operatingsystem') == 'CentOS') && \ - fact('operatingsystemrelease') =~ /^5\./ then - - ppm = pp({ - 'table' => "'raw'", - 'socket' => 'true', - 'chain' => "'PREROUTING'", - 'jump' => 'LOG', - 'log_level' => 'debug', - }) + ppm = pp({ + 'table' => "'raw'", + 'socket' => 'true', + 'chain' => "'PREROUTING'", + 'jump' => 'LOG', + 'log_level' => 'debug', + }) - expect(apply_manifest(ppm, :catch_failures => true).exit_code).to eq(2) - expect(apply_manifest(ppm, :catch_failures => true).exit_code).to be_zero - end + expect(apply_manifest(ppm, :catch_failures => true).exit_code).to eq(2) + expect(apply_manifest(ppm, :catch_failures => true).exit_code).to be_zero end it 'test log rule' do