summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Fields <cyberious@users.noreply.github.com>2014-06-23 13:46:59 -0700
committerTravis Fields <cyberious@users.noreply.github.com>2014-06-23 13:46:59 -0700
commit8510d344d5d2dbfe6d321e09dc85eaff967f6dd9 (patch)
treee03ff73a2c213ffdab472b1964d5513753866ca6
parent3ec3a4b0facc22b323d0fc6f16d6c6a5a1323ded (diff)
parent4b7162896a0a4ec5dc5166c8846eb5968a3c5329 (diff)
downloadpuppet-stdlib-8510d344d5d2dbfe6d321e09dc85eaff967f6dd9.tar.gz
puppet-stdlib-8510d344d5d2dbfe6d321e09dc85eaff967f6dd9.tar.bz2
Merge pull request #279 from hunner/osx_interface
OS X also has lo0 and can't manage user homedirs
-rwxr-xr-xspec/acceptance/getparam_spec.rb12
-rwxr-xr-xspec/acceptance/has_interface_with_spec.rb2
2 files changed, 7 insertions, 7 deletions
diff --git a/spec/acceptance/getparam_spec.rb b/spec/acceptance/getparam_spec.rb
index 91fc9a0..e3e442f 100755
--- a/spec/acceptance/getparam_spec.rb
+++ b/spec/acceptance/getparam_spec.rb
@@ -3,18 +3,18 @@ require 'spec_helper_acceptance'
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
diff --git a/spec/acceptance/has_interface_with_spec.rb b/spec/acceptance/has_interface_with_spec.rb
index 7b38c95..99b7681 100755
--- a/spec/acceptance/has_interface_with_spec.rb
+++ b/spec/acceptance/has_interface_with_spec.rb
@@ -27,7 +27,7 @@ describe 'has_interface_with function', :unless => UNSUPPORTED_PLATFORMS.include
end
it 'has_interface_with existing interface' do
pp = <<-EOS
- if $osfamily == 'Solaris' {
+ if $osfamily == 'Solaris' or $osfamily == 'Darwin' {
$a = 'lo0'
} else {
$a = 'lo'