opuppet/puppetlabs-stdlib
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #488 from cyberious/master

Browse source 
(maint) Fix test to not assume is_pe fact on > 4.0.0 puppet
This commit is contained in:
Hunter Haugen 2015-07-20 16:28:57 -07:00
commit 21feb4b1f1
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
spec/acceptance/fqdn_rand_string_spec.rb
View file

@ -4,7 +4,8 @@ require 'spec_helper_acceptance'
describe 'fqdn_rand_string function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do describe 'fqdn_rand_string function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
describe 'success' do describe 'success' do
let(:facts_d) 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('osfamily') =~ /windows/i
if fact('kernelmajversion').to_f < 6.0 if fact('kernelmajversion').to_f < 6.0
'c:/documents and settings/all users/application data/puppetlabs/facter/facts.d' 'c:/documents and settings/all users/application data/puppetlabs/facter/facts.d'

3
spec/acceptance/fqdn_rotate_spec.rb
View file

@ -4,7 +4,8 @@ require 'spec_helper_acceptance'
describe 'fqdn_rotate function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do describe 'fqdn_rotate function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
describe 'success' do describe 'success' do
let(:facts_d) 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('osfamily') =~ /windows/i
if fact('kernelmajversion').to_f < 6.0 if fact('kernelmajversion').to_f < 6.0
'C:/Documents and Settings/All Users/Application Data/PuppetLabs/facter/facts.d' 'C:/Documents and Settings/All Users/Application Data/PuppetLabs/facter/facts.d'