summaryrefslogtreecommitdiff
path: root/spec/acceptance
diff options
context:
space:
mode:
authorHunter Haugen <hunter@puppetlabs.com>2014-06-26 13:13:19 -0700
committerHunter Haugen <hunter@puppetlabs.com>2014-06-26 13:13:19 -0700
commita3de9853078f63541090c29f9f9d911869fbf071 (patch)
tree1a93822ab7312dba3dcc1fa4a5bf8f4a312d4444 /spec/acceptance
parent418c0ac0123593710e0731ca8aa559ad6580f30d (diff)
parentb93f71f0ced2cb87e4817e2eb4858fb1e47f3901 (diff)
downloadpuppet-stdlib-a3de9853078f63541090c29f9f9d911869fbf071.tar.gz
puppet-stdlib-a3de9853078f63541090c29f9f9d911869fbf071.tar.bz2
Merge pull request #291 from hunner/no_network_win
has_ip_network doesn't work on windows either
Diffstat (limited to 'spec/acceptance')
-rwxr-xr-xspec/acceptance/has_ip_network_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/acceptance/has_ip_network_spec.rb b/spec/acceptance/has_ip_network_spec.rb
index 692eaf9..1628746 100755
--- a/spec/acceptance/has_ip_network_spec.rb
+++ b/spec/acceptance/has_ip_network_spec.rb
@@ -1,7 +1,7 @@
#! /usr/bin/env ruby -S rspec
require 'spec_helper_acceptance'
-describe 'has_ip_network function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'has_ip_network function', :unless => ((UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem'))) or (fact('osfamily') == 'windows')) do
describe 'success' do
it 'has_ip_network existing ipaddress' do
pp = <<-EOS