Skip to content

Commit

Permalink
Merge pull request redhat-openstack#279 from hunner/osx_interface
Browse files Browse the repository at this point in the history
OS X also has lo0 and can't manage user homedirs
  • Loading branch information
cyberious committed Jun 23, 2014
2 parents 3ec3a4b + 4b71628 commit 8510d34
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions spec/acceptance/getparam_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@

describe 'getparam function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
describe 'success' do
it 'getparam a package' do
it 'getparam a notify' do
pp = <<-EOS
user { "rspec":
ensure => present,
managehome => true,
notify { 'rspec':
ensure => present,
message => 'custom rspec message',
}
$o = getparam(User['rspec'], 'managehome')
$o = getparam(Notify['rspec'], 'message')
notice(inline_template('getparam is <%= @o.inspect %>'))
EOS

apply_manifest(pp, :catch_failures => true) do |r|
expect(r.stdout).to match(/getparam is true/)
expect(r.stdout).to match(/getparam is "custom rspec message"/)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/has_interface_with_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
end
it 'has_interface_with existing interface' do
pp = <<-EOS
if $osfamily == 'Solaris' {
if $osfamily == 'Solaris' or $osfamily == 'Darwin' {
$a = 'lo0'
} else {
$a = 'lo'
Expand Down

0 comments on commit 8510d34

Please sign in to comment.