]> review.fuel-infra Code Review - puppet-modules/puppetlabs-firewall.git/commitdiff
Merge pull request #941 from adrianiurca/add_acceptance_test
authorsanfrancrisko <55992494+sanfrancrisko@users.noreply.github.com>
Fri, 4 Dec 2020 14:14:33 +0000 (14:14 +0000)
committerGitHub <noreply@github.com>
Fri, 4 Dec 2020 14:14:33 +0000 (14:14 +0000)
(IAC-966) - MODULES-10522: Add support for the --condition parameter

1  2 
README.md
lib/puppet/type/firewall.rb
spec/acceptance/firewall_attributes_exceptions_spec.rb
spec/spec_helper_acceptance_local.rb

diff --cc README.md
Simple merge
Simple merge
index 204955c8508349af61c354a678653900ce2f475a,c5ec3bcb14e9d80089d6fcb15d52db7b1fd668e8..d620d0803fe01411029e89ca8c458faa3896326b
@@@ -48,18 -44,11 +48,22 @@@ def fetch_os_nam
  end
  
  RSpec.configure do |c|
+   # This flag is disabling test 'condition' from firewall_attributes_exceptions
+   # because this test is failing on docker containers, but it's compatible with vmpooler machines
+   # To enable tests on abs/vmpooler machines just set to `true` this flag
+   c.filter_run_excluding condition_parameter_test: false
    c.before :suite do
 +    if fetch_os_name == 'centos' && os[:release].to_i == 8
 +      pp = <<-PUPPETCODE
 +        package { 'iptables-services':
 +          ensure => 'latest',
 +        }
 +        package { 'policycoreutils':
 +          ensure => 'latest',
 +        }
 +      PUPPETCODE
 +      LitmusHelper.instance.apply_manifest(pp)
 +    end
      if os[:family] == 'debian' && os[:release].to_i == 10
        pp = <<-PUPPETCODE
          package { 'net-tools':