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

Add puppet_version back to spec_helper

Browse source
This commit is contained in:
Hunter Haugen 2015-08-11 19:52:43 -07:00
parent a72918f675
commit 57275061ab
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
spec/spec_helper_acceptance.rb
View file

@ -35,13 +35,14 @@ end
RSpec.shared_context "with faked facts" do RSpec.shared_context "with faked facts" do
let(:facts_d) do let(:facts_d) do
puppet_version = (on default, puppet('--version')).output.chomp
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'
else else
'C:/ProgramData/PuppetLabs/facter/facts.d' 'C:/ProgramData/PuppetLabs/facter/facts.d'
end end
elsif fact('is_pe', '--puppet') == "true" elsif Puppet::Util::Package.versioncmp(puppet_version, '4.0.0') < 0 and fact('is_pe', '--puppet') == "true"
'/etc/puppetlabs/facter/facts.d' '/etc/puppetlabs/facter/facts.d'
else else
'/etc/facter/facts.d' '/etc/facter/facts.d'