Skip to content

Commit cb8a224

Browse files
author
Travis Fields
committed
(maint) Fix test to not assume is_pe fact on > 4.0.0 puppet
1 parent 1282649 commit cb8a224

2 files changed

Lines changed: 22 additions & 12 deletions

File tree

spec/acceptance/fqdn_rand_string_spec.rb

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,20 @@
44
describe 'fqdn_rand_string function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
55
describe 'success' do
66
let(:facts_d) do
7-
if fact('is_pe', '--puppet') == "true"
8-
if fact('osfamily') =~ /windows/i
9-
if fact('kernelmajversion').to_f < 6.0
10-
'c:/documents and settings/all users/application data/puppetlabs/facter/facts.d'
7+
puppet_version = (on default, puppet('--version')).output.chomp
8+
if puppet_version < '4.0.0'
9+
if fact('is_pe', '--puppet') == "true"
10+
if fact('osfamily') =~ /windows/i
11+
if fact('kernelmajversion').to_f < 6.0
12+
'c:/documents and settings/all users/application data/puppetlabs/facter/facts.d'
13+
else
14+
'c:/programdata/puppetlabs/facter/facts.d'
15+
end
1116
else
12-
'c:/programdata/puppetlabs/facter/facts.d'
17+
'/etc/puppetlabs/facter/facts.d'
1318
end
1419
else
15-
'/etc/puppetlabs/facter/facts.d'
20+
'/etc/facter/facts.d'
1621
end
1722
else
1823
'/etc/facter/facts.d'

spec/acceptance/fqdn_rotate_spec.rb

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,20 @@
44
describe 'fqdn_rotate function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
55
describe 'success' do
66
let(:facts_d) do
7-
if fact('is_pe', '--puppet') == "true"
8-
if fact('osfamily') =~ /windows/i
9-
if fact('kernelmajversion').to_f < 6.0
10-
'C:/Documents and Settings/All Users/Application Data/PuppetLabs/facter/facts.d'
7+
puppet_version = (on default, puppet('--version')).output.chomp
8+
if puppet_version < '4.0.0'
9+
if fact('is_pe', '--puppet') == "true"
10+
if fact('osfamily') =~ /windows/i
11+
if fact('kernelmajversion').to_f < 6.0
12+
'C:/Documents and Settings/All Users/Application Data/PuppetLabs/facter/facts.d'
13+
else
14+
'C:/ProgramData/PuppetLabs/facter/facts.d'
15+
end
1116
else
12-
'C:/ProgramData/PuppetLabs/facter/facts.d'
17+
'/etc/puppetlabs/facter/facts.d'
1318
end
1419
else
15-
'/etc/puppetlabs/facter/facts.d'
20+
'/etc/facter/facts.d'
1621
end
1722
else
1823
'/etc/facter/facts.d'

0 commit comments

Comments
 (0)