(maint) Fix test to not assume is_pe fact on > 4.0.0 puppet

diff --git a/spec/acceptance/fqdn_rand_string_spec.rb b/spec/acceptance/fqdn_rand_string_spec.rb
index 881cff37eb7eecb7c05f8d1a12a84204c1c5c353..fec3c93282730d630039c7a1be00e0d27e87e126 100644 (file)
--- a/spec/acceptance/fqdn_rand_string_spec.rb
+++ b/spec/acceptance/fqdn_rand_string_spec.rb
@@ -4,7 +4,8 @@ require 'spec_helper_acceptance'
 describe 'fqdn_rand_string function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
   describe 'success' do
     let(:facts_d) do
-      if fact('is_pe', '--puppet') == "true"
+      puppet_version = (on default, puppet('--version')).output.chomp
+      if puppet_version < '4.0.0' && fact('is_pe', '--puppet') == "true"
         if fact('osfamily') =~ /windows/i
           if fact('kernelmajversion').to_f < 6.0
             'c:/documents and settings/all users/application data/puppetlabs/facter/facts.d'

diff --git a/spec/acceptance/fqdn_rotate_spec.rb b/spec/acceptance/fqdn_rotate_spec.rb
index f1a15d34ea72f9fb1bdec6dfaa848345974c8e80..556c6091817a106567385494499f709bdc0c499c 100755 (executable)
--- a/spec/acceptance/fqdn_rotate_spec.rb
+++ b/spec/acceptance/fqdn_rotate_spec.rb
@@ -4,7 +4,8 @@ require 'spec_helper_acceptance'
 describe 'fqdn_rotate function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
   describe 'success' do
     let(:facts_d) do
-      if fact('is_pe', '--puppet') == "true"
+      puppet_version = (on default, puppet('--version')).output.chomp
+      if puppet_version < '4.0.0' && fact('is_pe', '--puppet') == "true"
         if fact('osfamily') =~ /windows/i
           if fact('kernelmajversion').to_f < 6.0
             'C:/Documents and Settings/All Users/Application Data/PuppetLabs/facter/facts.d'