From eb507c9a5486d269ec6a36f169eb68695910bfbf Mon Sep 17 00:00:00 2001
From: Travis Fields <travis@puppetlabs.com>
Date: Mon, 23 Jun 2014 23:27:59 -0700
Subject: [PATCH] Fixed fqdn,getparam and has_interface_with spec tests

---
 spec/acceptance/fqdn_rotate_spec.rb        | 19 ++++++++++++++++---
 spec/acceptance/getparam_spec.rb           |  1 -
 spec/acceptance/has_interface_with_spec.rb | 10 ++++++++--
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/spec/acceptance/fqdn_rotate_spec.rb b/spec/acceptance/fqdn_rotate_spec.rb
index fc8bea24e..2527c28da 100755
--- a/spec/acceptance/fqdn_rotate_spec.rb
+++ b/spec/acceptance/fqdn_rotate_spec.rb
@@ -5,7 +5,15 @@
   describe 'success' do
     let(:facts_d) do
       if fact('is_pe') == "true"
-        '/etc/puppetlabs/facter/facts.d'
+        if fact('osfamily') =~ /windows/i
+          if fact('kernelmajversion').to_f < 6.0
+            'C:\Documents and Settings\All Users\Application Data\PuppetLabs\facter\facts.d'
+          else
+            'C:\ProgramData\PuppetLabs\facter\facts.d'
+          end
+        else
+          '/etc/puppetlabs/facter/facts.d'
+        end
       else
         '/etc/facter/facts.d'
       end
@@ -13,9 +21,14 @@
     after :each do
       shell("if [ -f #{facts_d}/fqdn.txt ] ; then rm #{facts_d}/fqdn.txt ; fi")
     end
+    before :all do
+      #No need to create on windows, PE creates by default
+      if fact('osfamily') !~ /windows/i
+        shell("mkdir -p #{facts_d}")
+      end
+    end
     it 'fqdn_rotates floats' do
-      shell("mkdir -p #{facts_d}")
-      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/getparam_spec.rb b/spec/acceptance/getparam_spec.rb
index e3e442fb8..b1a677eca 100755
--- a/spec/acceptance/getparam_spec.rb
+++ b/spec/acceptance/getparam_spec.rb
@@ -6,7 +6,6 @@
     it 'getparam a notify' do
       pp = <<-EOS
       notify { 'rspec':
-        ensure  => present,
         message => 'custom rspec message',
       }
       $o = getparam(Notify['rspec'], 'message')
diff --git a/spec/acceptance/has_interface_with_spec.rb b/spec/acceptance/has_interface_with_spec.rb
index 99b768113..c9decdf0e 100755
--- a/spec/acceptance/has_interface_with_spec.rb
+++ b/spec/acceptance/has_interface_with_spec.rb
@@ -5,7 +5,7 @@
   describe 'success' do
     it 'has_interface_with existing ipaddress' do
       pp = <<-EOS
-      $a = '127.0.0.1'
+      $a = $::ipaddress
       $o = has_interface_with('ipaddress', $a)
       notice(inline_template('has_interface_with is <%= @o.inspect %>'))
       EOS
@@ -29,7 +29,13 @@
       pp = <<-EOS
       if $osfamily == 'Solaris' or $osfamily == 'Darwin' {
         $a = 'lo0'
-      } else {
+      }elsif $osfamily == 'windows' {
+        $a = $::kernelmajversion ? {
+          /6\.(2|3|4)/ => 'Ethernet0',
+          /6\.(0|1)/ => 'Local_Area_Connection',
+          /5\.(1|2)/  => undef, #Broken current in facter
+        }
+      }else {
         $a = 'lo'
       }
       $o = has_interface_with($a)