Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix failing persist_iptables test on RHEL7 and Fedora #341

Merged
merged 2 commits into from
Apr 15, 2014

Conversation

jeckersb
Copy link
Contributor

@jeckersb jeckersb commented Apr 4, 2014

This corrects the following failure:

  1) Puppet::Util::Firewall #persist_iptables when proto is IPv4 should raise a warning when exec fails
     Failure/Error: subject.persist_iptables(proto)
       Firewall[000 test foo] received :execute with unexpected arguments
         expected: (["/sbin/service", "iptables", "save"])
              got: (["/usr/libexec/iptables/iptables.init", "save"])
     # ./lib/puppet/util/firewall.rb:220:in `persist_iptables'
     # ./spec/unit/puppet/util/firewall_spec.rb:166:in `block (4 levels) in <top (required)>'

Otherwise, persist_iptables falls into the RHEL7 case and sets os_key to 'Fedora', which causes the executed command to be set incorrectly.

@jeckersb
Copy link
Contributor Author

jeckersb commented Apr 4, 2014

/me shoots ruby 1.8.7 a dirty look

apenney pushed a commit that referenced this pull request Apr 15, 2014
Fix failing persist_iptables test on RHEL7 and Fedora
@apenney apenney merged commit 801b20a into puppetlabs:master Apr 15, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants