Fixes for UNSUPPORTED_PLATFORMS and tests.

Tests didn't have checks to only run on supported platforms. There
was no test for unsupported platforms. Added UNSUPPORTED_PLATFORMS
to spec_helper_acceptance.

diff --git a/spec/acceptance/change_source_spec.rb b/spec/acceptance/change_source_spec.rb
index cdb4eab3543bd3958690e51b3692c623228bb329..f59110870c31cce9ddd1d1ed3981c44ad60ee008 100644 (file)
--- a/spec/acceptance/change_source_spec.rb
+++ b/spec/acceptance/change_source_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'firewall type' do
+describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   describe 'reset' do
     it 'deletes all rules' do
       shell('iptables --flush; iptables -t nat --flush; iptables -t mangle --flush')

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index aaf05a1f53fc0646a8d1b4fae3defc4855c89ca0..4a9751a6c2e4e4e3848383c1545d89410fee17a6 100644 (file)
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe "firewall class:" do
+describe "firewall class:", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   it 'should run successfully' do
     pp = "class { 'firewall': }"
 

diff --git a/spec/acceptance/connlimit_spec.rb b/spec/acceptance/connlimit_spec.rb
index ce6cab4ed72f2954b2d46329a26fab5bcdd7806b..bb049a9e04fa37536e96c088b6979f73d56d731a 100644 (file)
--- a/spec/acceptance/connlimit_spec.rb
+++ b/spec/acceptance/connlimit_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'firewall type' do
+describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
 
   describe 'connlimit_above' do
     context '10' do

diff --git a/spec/acceptance/connmark_spec.rb b/spec/acceptance/connmark_spec.rb
index 959efbdfa7b0d512ebc3f6e56a1938b3af9d22bd..b3409ab2d81800ea10491a379174a121425cf1be 100644 (file)
--- a/spec/acceptance/connmark_spec.rb
+++ b/spec/acceptance/connmark_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'firewall type' do
+describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
 
   describe 'connmark' do
     context '50' do

diff --git a/spec/acceptance/firewall_spec.rb b/spec/acceptance/firewall_spec.rb
index 5353e104d59db811a847f5410cd48a0f21f65f7a..b8a57cee920726fc300cd654d2c92ca7bc799bee 100644 (file)
--- a/spec/acceptance/firewall_spec.rb
+++ b/spec/acceptance/firewall_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'firewall type' do
+describe 'firewall type', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
 
   describe 'reset' do
     it 'deletes all rules' do

diff --git a/spec/acceptance/firewallchain_spec.rb b/spec/acceptance/firewallchain_spec.rb
index 757336a75c16471844e3e6e86b0faaf30bb24d39..f70d9cefd719de34f4eadf84b28d693341cc02d5 100644 (file)
--- a/spec/acceptance/firewallchain_spec.rb
+++ b/spec/acceptance/firewallchain_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'puppet resource firewallchain command:' do
+describe 'puppet resource firewallchain command:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   before :all do
     iptables_flush_all_tables
   end

diff --git a/spec/acceptance/ip6_fragment_spec.rb b/spec/acceptance/ip6_fragment_spec.rb
index bfce0e607fdb20db757bfa42b9a969931b2dcee4..3e44f8723e6d3154b1ea5d049c17f0e58a6262e9 100644 (file)
--- a/spec/acceptance/ip6_fragment_spec.rb
+++ b/spec/acceptance/ip6_fragment_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
 if default['platform'] =~ /el-5/
-  describe "firewall ip6tables doesn't work on 1.3.5 because --comment is missing" do
+  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
     end
@@ -19,7 +19,7 @@ if default['platform'] =~ /el-5/
     end
   end
 else
-  describe 'firewall ishasmorefrags/islastfrag/isfirstfrag properties' do
+  describe 'firewall ishasmorefrags/islastfrag/isfirstfrag properties', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
     before :all do
       ip6tables_flush_all_tables
     end

diff --git a/spec/acceptance/isfragment_spec.rb b/spec/acceptance/isfragment_spec.rb
index 7fdedc28732275908ab976999cfce83b40ca3f8b..a4b65e76e82f1b76ba41dc40492d46d0e5ccd185 100644 (file)
--- a/spec/acceptance/isfragment_spec.rb
+++ b/spec/acceptance/isfragment_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'firewall isfragment property' do
+describe 'firewall isfragment property', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   before :all do
     iptables_flush_all_tables
   end

diff --git a/spec/acceptance/params_spec.rb b/spec/acceptance/params_spec.rb
index c0f93ad21f3ceb7cd3d75d78c7b733deeeb10759..93b83ef145db016b3d3a5af78872156d83d1d8a5 100644 (file)
--- a/spec/acceptance/params_spec.rb
+++ b/spec/acceptance/params_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe "param based tests:" do
+describe "param based tests:", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   # Takes a hash and converts it into a firewall resource
   def pp(params)
     name = params.delete('name') || '100 test'

diff --git a/spec/acceptance/purge_spec.rb b/spec/acceptance/purge_spec.rb
index f62b14f936e65b55e3b831e951c27367b8c21372..4de968a3264b7f7e4136a8d0a00211880db4c203 100644 (file)
--- a/spec/acceptance/purge_spec.rb
+++ b/spec/acceptance/purge_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe "purge tests:" do
+describe "purge tests:", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   context('resources purge') do
     before(:all) do
       iptables_flush_all_tables

diff --git a/spec/acceptance/resource_cmd_spec.rb b/spec/acceptance/resource_cmd_spec.rb
index c9a852d82648b0b4f9a8f3360916373ea3426bd0..f964df79e742d2c9936b128f4f23f51bfae2055a 100644 (file)
--- a/spec/acceptance/resource_cmd_spec.rb
+++ b/spec/acceptance/resource_cmd_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper_acceptance'
 # Here we want to test the the resource commands ability to work with different
 # existing ruleset scenarios. This will give the parsing capabilities of the
 # code a good work out.
-describe 'puppet resource firewall command:' do
+describe 'puppet resource firewall command:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   context 'make sure it returns no errors when executed on a clean machine' do
     it do
       shell('puppet resource firewall') do |r|

diff --git a/spec/acceptance/rules_spec.rb b/spec/acceptance/rules_spec.rb
index b0e66ae5bc4b6fc4d4cc31b9189abbe76bf67448..b7eb2df161ef99de35667cd904c346cfb1db876f 100644 (file)
--- a/spec/acceptance/rules_spec.rb
+++ b/spec/acceptance/rules_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'complex ruleset 1' do
+describe 'complex ruleset 1', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   before :all do
     iptables_flush_all_tables
   end

diff --git a/spec/acceptance/socket_spec.rb b/spec/acceptance/socket_spec.rb
index c4a05348cf35c5bb61e55c94eb1fbfefe27ba193..5503a9a077872e299b7c3e6300e63aa6d3873ffd 100644 (file)
--- a/spec/acceptance/socket_spec.rb
+++ b/spec/acceptance/socket_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
 # RHEL5 does not support -m socket
-describe 'firewall socket property', :unless => (default['platform'] =~ /el-5/ || fact('operatingsystem') == 'SLES') do
+describe 'firewall socket property', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) || default['platform'] =~ /el-5/ || fact('operatingsystem') == 'SLES') do
   before :all do
     iptables_flush_all_tables
   end

diff --git a/spec/acceptance/standard_usage_spec.rb b/spec/acceptance/standard_usage_spec.rb
index f29278b97f33ac33bcab70054d118c6cd55b6f13..8dcbceff190e10381b010521d45db4921d93e462 100644 (file)
--- a/spec/acceptance/standard_usage_spec.rb
+++ b/spec/acceptance/standard_usage_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
 # Some tests for the standard recommended usage
-describe 'standard usage tests:' do
+describe 'standard usage tests:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   it 'applies twice' do
     pp = <<-EOS
       class my_fw::pre {

diff --git a/spec/acceptance/unsupported_spec.rb b/spec/acceptance/unsupported_spec.rb
new file mode 100644 (file)
index 0000000..dfb75e2
--- /dev/null
+++ b/spec/acceptance/unsupported_spec.rb
@@ -0,0 +1,10 @@
+require 'spec_helper_acceptance'
+
+describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+  it 'should fail' do
+    pp = <<-EOS
+      class { 'firewall': }
+    EOS
+    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/not currently supported/i)
+  end
+end

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 13d056fa93496e038a157b3c3a9df0a99e1ee765..4f0fc947e01aee75decd80381e090a858a0baaef 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -23,6 +23,8 @@ unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
   end
 end
 
+UNSUPPORTED_PLATFORMS = ['windows','Solaris','Darwin']
+
 RSpec.configure do |c|
   # Project root
   proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))