]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Disable windows network stuff and quote path
authorHunter Haugen <hunter@puppetlabs.com>
Wed, 25 Jun 2014 17:16:06 +0000 (10:16 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Wed, 25 Jun 2014 17:16:06 +0000 (10:16 -0700)
spec/acceptance/fqdn_rotate_spec.rb
spec/acceptance/has_interface_with_spec.rb
spec/acceptance/has_ip_address_spec.rb

index d56c2b1f065699a20657b81ca40f23125b3d0730..ee2afb5a92d1971531b316c52a7c76381a178f35 100755 (executable)
@@ -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)
index c9decdf0e199a9510720922d489aa941aafe693f..b09199a7d8fc7033f8d9a623a53f7c779e512340 100755 (executable)
@@ -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
index 7d5fd87292632231abf2c59800a13a1a1182045f..50eb8f5cf81aec988a18ab4cf0690bb3d182cb72 100755 (executable)
@@ -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