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_ip_address_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_ip_address_spec.rb')
-rwxr-xr-x | spec/acceptance/has_ip_address_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/acceptance/has_ip_address_spec.rb b/spec/acceptance/has_ip_address_spec.rb index 7d5fd87..149a10d 100755 --- a/spec/acceptance/has_ip_address_spec.rb +++ b/spec/acceptance/has_ip_address_spec.rb @@ -1,7 +1,7 @@ #! /usr/bin/env ruby -S rspec require 'spec_helper_acceptance' -describe 'has_ip_address function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do +describe 'has_ip_address function', :unless => ((UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem'))) or (fact('osfamily') == 'windows') or (fact('osfamily') == 'AIX')) do describe 'success' do it 'has_ip_address existing ipaddress' do pp = <<-EOS |