diff options
author | Travis Fields <cyberious@users.noreply.github.com> | 2014-06-25 10:41:07 -0700 |
---|---|---|
committer | Travis Fields <cyberious@users.noreply.github.com> | 2014-06-25 10:41:07 -0700 |
commit | 418c0ac0123593710e0731ca8aa559ad6580f30d (patch) | |
tree | a957dcac0377948168b62571f7b8f791a576fb7d | |
parent | ac21d508477e91730f34107837a9ea6a9fbc604d (diff) | |
parent | 05b79dcabbdb67aab322fa6e12e77532ab044749 (diff) | |
download | puppet-stdlib-418c0ac0123593710e0731ca8aa559ad6580f30d.tar.gz puppet-stdlib-418c0ac0123593710e0731ca8aa559ad6580f30d.tar.bz2 |
Merge pull request #289 from hunner/disable_tests
Disable windows network stuff and quote path
-rwxr-xr-x | spec/acceptance/fqdn_rotate_spec.rb | 2 | ||||
-rwxr-xr-x | spec/acceptance/has_interface_with_spec.rb | 2 | ||||
-rwxr-xr-x | spec/acceptance/has_ip_address_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/acceptance/fqdn_rotate_spec.rb b/spec/acceptance/fqdn_rotate_spec.rb index d56c2b1..ee2afb5 100755 --- a/spec/acceptance/fqdn_rotate_spec.rb +++ b/spec/acceptance/fqdn_rotate_spec.rb @@ -28,7 +28,7 @@ describe 'fqdn_rotate function', :unless => UNSUPPORTED_PLATFORMS.include?(fact( end end it 'fqdn_rotates floats' do - shell("echo fqdn=fakehost.localdomain > #{facts_d}/fqdn.txt") + shell("echo fqdn=fakehost.localdomain > '#{facts_d}/fqdn.txt'") pp = <<-EOS $a = ['a','b','c','d'] $o = fqdn_rotate($a) diff --git a/spec/acceptance/has_interface_with_spec.rb b/spec/acceptance/has_interface_with_spec.rb index c9decdf..b09199a 100755 --- a/spec/acceptance/has_interface_with_spec.rb +++ b/spec/acceptance/has_interface_with_spec.rb @@ -1,7 +1,7 @@ #! /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')) do describe 'success' do it 'has_interface_with existing ipaddress' do pp = <<-EOS diff --git a/spec/acceptance/has_ip_address_spec.rb b/spec/acceptance/has_ip_address_spec.rb index 7d5fd87..50eb8f5 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')) do describe 'success' do it 'has_ip_address existing ipaddress' do pp = <<-EOS |