Skip to content

Commit 418c0ac

Browse files
committed
Merge pull request redhat-openstack#289 from hunner/disable_tests
Disable windows network stuff and quote path
2 parents ac21d50 + 05b79dc commit 418c0ac

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

spec/acceptance/fqdn_rotate_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
end
2929
end
3030
it 'fqdn_rotates floats' do
31-
shell("echo fqdn=fakehost.localdomain > #{facts_d}/fqdn.txt")
31+
shell("echo fqdn=fakehost.localdomain > '#{facts_d}/fqdn.txt'")
3232
pp = <<-EOS
3333
$a = ['a','b','c','d']
3434
$o = fqdn_rotate($a)

spec/acceptance/has_interface_with_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /usr/bin/env ruby -S rspec
22
require 'spec_helper_acceptance'
33

4-
describe 'has_interface_with function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
4+
describe 'has_interface_with function', :unless => ((UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem'))) or (fact('osfamily') == 'windows')) do
55
describe 'success' do
66
it 'has_interface_with existing ipaddress' do
77
pp = <<-EOS

spec/acceptance/has_ip_address_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /usr/bin/env ruby -S rspec
22
require 'spec_helper_acceptance'
33

4-
describe 'has_ip_address function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
4+
describe 'has_ip_address function', :unless => ((UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem'))) or (fact('osfamily') == 'windows')) do
55
describe 'success' do
66
it 'has_ip_address existing ipaddress' do
77
pp = <<-EOS

0 commit comments

Comments
 (0)