(maint) name test file correctly, remove uneeded check

diff --git a/spec/acceptance/firewall_log_spec.rb b/spec/acceptance/firewall_log_spec.rb
new file mode 100644 (file)
index 0000000..4693221
--- /dev/null
+++ b/spec/acceptance/firewall_log_spec.rb
@@ -0,0 +1,75 @@
+require 'spec_helper_acceptance'
+
+describe 'log based tests' do
+  before :all do
+    iptables_flush_all_tables
+    ip6tables_flush_all_tables
+  end
+
+  ppm2 = <<-PUPPETCODE
+    firewall { '998 log all':
+      proto     => 'all',
+      jump      => 'LOG',
+      log_level => 'debug',
+    }
+  PUPPETCODE
+  values = [2, 0]
+  it 'test log rule' do
+    iptables_flush_all_tables
+
+    values.each do |value|
+      expect(apply_manifest(ppm2, catch_failures: true).exit_code).to eq(value)
+    end
+  end
+
+  ppm3 = <<-PUPPETCODE
+    firewall { '004 log all INVALID packets':
+      chain      => 'INPUT',
+      proto      => 'all',
+      ctstate    => 'INVALID',
+      jump       => 'LOG',
+      log_level  => '3',
+      log_prefix => 'IPTABLES dropped invalid: ',
+    }
+  PUPPETCODE
+  ppm4 = <<-PUPPETCODE
+    firewall { '003 log all INVALID packets':
+      chain      => 'INPUT',
+      proto      => 'all',
+      ctstate    => 'INVALID',
+      jump       => 'LOG',
+      log_level  => '3',
+      log_prefix => 'IPTABLES dropped invalid: ',
+    }
+  PUPPETCODE
+  ppm5 = <<-PUPPETCODE + "\n" + ppm4
+      resources { 'firewall':
+        purge => true,
+      }
+  PUPPETCODE
+  it 'test log rule - changing names' do
+    iptables_flush_all_tables
+
+    expect(apply_manifest(ppm3, catch_failures: true).exit_code).to eq(2)
+    expect(apply_manifest(ppm5, catch_failures: true).exit_code).to eq(2)
+  end
+
+  ppm9 = <<-PUPPETCODE
+    firewall { '004 log all INVALID packets':
+      chain      => 'INPUT',
+      proto      => 'all',
+      ctstate    => 'INVALID',
+      jump       => 'LOG',
+      log_level  => '3',
+      log_prefix => 'IPTABLES dropped invalid: ',
+    }
+  PUPPETCODE
+  values = [2, 0]
+  it 'test log rule - idempotent' do
+    iptables_flush_all_tables
+
+    values.each do |value|
+      expect(apply_manifest(ppm9, catch_failures: true).exit_code).to eq(value)
+    end
+  end
+end

diff --git a/spec/acceptance/firewall_spec.rb b/spec/acceptance/firewall_spec.rb
index 87171086227390e5689dc49a34ac8000bb85b7d8..df8294137cefc586601eec53fa0dbb1f24b1b255 100644 (file)
--- a/spec/acceptance/firewall_spec.rb
+++ b/spec/acceptance/firewall_spec.rb
@@ -825,32 +825,6 @@ describe 'firewall basics', docker: true do
         end
       end
     end
-
-    context 'when jump and apply' do
-      pp34 = <<-PUPPETCODE
-          class { '::firewall': }
-          firewallchain { 'TEST:filter:IPv4':
-            ensure => present,
-          }
-          firewall { '568 - test':
-            proto  => tcp,
-            chain  => 'INPUT',
-            action => 'accept',
-            jump  => 'TEST',
-          }
-      PUPPETCODE
-      it 'applies' do
-        apply_manifest(pp34, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{Only one of the parameters 'action' and 'jump' can be set})
-        end
-      end
-
-      it 'does not contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).not_to match(%r{-A INPUT -p tcp -m comment --comment "568 - test" -j TEST})
-        end
-      end
-    end
   end
 
   describe 'tosource' do

diff --git a/spec/acceptance/params_spec.rb b/spec/acceptance/params_spec.rb
deleted file mode 100644 (file)
index 76eb682..0000000
--- a/spec/acceptance/params_spec.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'param based tests' do
-  before :all do
-    iptables_flush_all_tables
-    ip6tables_flush_all_tables
-  end
-
-  ppm1 = <<-PUPPETCODE
-    firewall { '100 test':
-      table     => 'raw',
-      socket    => 'true',
-      chain     => 'PREROUTING',
-      jump      => 'LOG',
-      log_level => 'debug',
-    }
-  PUPPETCODE
-  values = [2, 0]
-  it 'test various params', unless: (default['platform'].match(%r{el-5}) || fact('operatingsystem') == 'SLES') do
-    iptables_flush_all_tables
-
-    values.each do |value|
-      expect(apply_manifest(ppm1, catch_failures: true).exit_code).to eq(value)
-    end
-  end
-
-  ppm2 = <<-PUPPETCODE
-    firewall { '998 log all':
-      proto     => 'all',
-      jump      => 'LOG',
-      log_level => 'debug',
-    }
-  PUPPETCODE
-  values = [2, 0]
-  it 'test log rule' do
-    iptables_flush_all_tables
-
-    values.each do |value|
-      expect(apply_manifest(ppm2, catch_failures: true).exit_code).to eq(value)
-    end
-  end
-
-  ppm3 = <<-PUPPETCODE
-    firewall { '004 log all INVALID packets':
-      chain      => 'INPUT',
-      proto      => 'all',
-      ctstate    => 'INVALID',
-      jump       => 'LOG',
-      log_level  => '3',
-      log_prefix => 'IPTABLES dropped invalid: ',
-    }
-  PUPPETCODE
-  ppm4 = <<-PUPPETCODE
-    firewall { '003 log all INVALID packets':
-      chain      => 'INPUT',
-      proto      => 'all',
-      ctstate    => 'INVALID',
-      jump       => 'LOG',
-      log_level  => '3',
-      log_prefix => 'IPTABLES dropped invalid: ',
-    }
-  PUPPETCODE
-  ppm5 = <<-PUPPETCODE + "\n" + ppm4
-      resources { 'firewall':
-        purge => true,
-      }
-  PUPPETCODE
-  it 'test log rule - changing names' do
-    iptables_flush_all_tables
-
-    expect(apply_manifest(ppm3, catch_failures: true).exit_code).to eq(2)
-    expect(apply_manifest(ppm5, catch_failures: true).exit_code).to eq(2)
-  end
-
-  ppm6 = <<-PUPPETCODE
-    firewall { '004 with a chain':
-      chain => 'INPUT',
-      proto => 'all',
-    }
-  PUPPETCODE
-  ppm7 = <<-PUPPETCODE
-    firewall { '004 with a chain':
-      chain => 'OUTPUT',
-      proto => 'all',
-    }
-  PUPPETCODE
-  _ppm8 = <<-PUPPETCODE + "\n" + ppm7
-      resources { 'firewall':
-        purge => true,
-      }
-  PUPPETCODE
-  it 'test chain - changing names' do
-    iptables_flush_all_tables
-
-    apply_manifest(ppm6, expect_changes: true)
-    expect(apply_manifest(ppm7, expect_failures: true).stderr).to match(%r{is not supported})
-  end
-
-  ppm9 = <<-PUPPETCODE
-    firewall { '004 log all INVALID packets':
-      chain      => 'INPUT',
-      proto      => 'all',
-      ctstate    => 'INVALID',
-      jump       => 'LOG',
-      log_level  => '3',
-      log_prefix => 'IPTABLES dropped invalid: ',
-    }
-  PUPPETCODE
-  values = [2, 0]
-  it 'test log rule - idempotent' do
-    iptables_flush_all_tables
-
-    values.each do |value|
-      expect(apply_manifest(ppm9, catch_failures: true).exit_code).to eq(value)
-    end
-  end
-
-  ppm10 = <<-PUPPETCODE
-    firewall { '997 block src ip range':
-      chain     => 'INPUT',
-      proto     => 'all',
-      action    => 'drop',
-      src_range => '10.0.0.1-10.0.0.10',
-    }
-  PUPPETCODE
-  values = [2, 0]
-  it 'test src_range rule' do
-    iptables_flush_all_tables
-
-    values.each do |value|
-      expect(apply_manifest(ppm10, catch_failures: true).exit_code).to eq(value)
-    end
-  end
-
-  ppm11 = <<-PUPPETCODE
-    firewall { '998 block dst ip range':
-      chain     => 'INPUT',
-      proto     => 'all',
-      action    => 'drop',
-      dst_range => '10.0.0.2-10.0.0.20',
-    }
-  PUPPETCODE
-  values = [2, 0]
-  it 'test dst_range rule' do
-    iptables_flush_all_tables
-
-    values.each do |value|
-      expect(apply_manifest(ppm11, catch_failures: true).exit_code).to eq(value)
-    end
-  end
-end

diff --git a/spec/unit/puppet/type/firewall_spec.rb b/spec/unit/puppet/type/firewall_spec.rb
index e09c8981026023e4ca9359a537ba3b03bba864fc..31c6fc82f1b09701876e186bbb6cd4f77e32ee22 100755 (executable)
--- a/spec/unit/puppet/type/firewall_spec.rb
+++ b/spec/unit/puppet/type/firewall_spec.rb
@@ -431,6 +431,7 @@ describe firewall do # rubocop:disable RSpec/MultipleDescribes
       }.to raise_error(RuntimeError, %r{Only one of the parameters 'action' and 'jump' can be set$})
     end
   end
+
   describe ':gid and :uid' do
     it 'allows me to set uid' do
       resource[:uid] = 'root'