Merge pull request redhat-openstack#279 from hunner/osx_interface

OS X also has lo0 and can't manage user homedirs
jguiditta · Jun 23, 2014 · 8510d34 · 8510d34
2 parents 3ec3a4b + 4b71628
commit 8510d34
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/spec/acceptance/getparam_spec.rb b/spec/acceptance/getparam_spec.rb
@@ -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

diff --git a/spec/acceptance/has_interface_with_spec.rb b/spec/acceptance/has_interface_with_spec.rb
@@ -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'