Merge pull request #322 from hunner/fix_socket

Fix logic for supported socket platforms
puppetlabs · Feb 21, 2014 · 045b614 · 045b614
2 parents 1f6e2a8 + aea1e52
commit 045b614
Showing 1 changed file with 10 additions and 14 deletions.
diff --git 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