diff options
author | Hunter Haugen <hunter@puppetlabs.com> | 2014-08-05 10:55:58 -0700 |
---|---|---|
committer | Hunter Haugen <hunter@puppetlabs.com> | 2014-08-05 10:55:58 -0700 |
commit | 2ba0e375e2bb5b4a85eac781f02f6a3e8b96e0f6 (patch) | |
tree | 3e6519a658f623c81667271c8c6f9a8b431f6aa2 /spec/acceptance/has_interface_with_spec.rb | |
parent | e310b1fdab7be1478b464167d2be20f0d4e5f63a (diff) | |
parent | 4c62b7a2eeec8d6e49ae8b05f2ed000a2b544cc2 (diff) | |
download | puppet-stdlib-2ba0e375e2bb5b4a85eac781f02f6a3e8b96e0f6.tar.gz puppet-stdlib-2ba0e375e2bb5b4a85eac781f02f6a3e8b96e0f6.tar.bz2 |
Merge branch '4.3.x'
Diffstat (limited to 'spec/acceptance/has_interface_with_spec.rb')
-rwxr-xr-x | spec/acceptance/has_interface_with_spec.rb | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/spec/acceptance/has_interface_with_spec.rb b/spec/acceptance/has_interface_with_spec.rb index 41ae19f..9590193 100755 --- a/spec/acceptance/has_interface_with_spec.rb +++ b/spec/acceptance/has_interface_with_spec.rb @@ -1,11 +1,11 @@ #! /usr/bin/env ruby -S rspec require 'spec_helper_acceptance' -describe 'has_interface_with function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do +describe 'has_interface_with function', :unless => ((UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem'))) or (fact('osfamily') == 'windows') or (fact('osfamily') == 'AIX')) do describe 'success' do it 'has_interface_with existing ipaddress' do pp = <<-EOS - $a = '127.0.0.1' + $a = $::ipaddress $o = has_interface_with('ipaddress', $a) notice(inline_template('has_interface_with is <%= @o.inspect %>')) EOS @@ -27,7 +27,17 @@ describe 'has_interface_with function', :unless => UNSUPPORTED_PLATFORMS.include end it 'has_interface_with existing interface' do pp = <<-EOS - $a = 'lo' + if $osfamily == 'Solaris' or $osfamily == 'Darwin' { + $a = 'lo0' + }elsif $osfamily == 'windows' { + $a = $::kernelmajversion ? { + /6\.(2|3|4)/ => 'Ethernet0', + /6\.(0|1)/ => 'Local_Area_Connection', + /5\.(1|2)/ => undef, #Broken current in facter + } + }else { + $a = 'lo' + } $o = has_interface_with($a) notice(inline_template('has_interface_with is <%= @o.inspect %>')) EOS |