RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Merge pull request #215 from vrtdev/bugfix/MODULES-4368-java_default_home-invalid-fact

Browse Source 
See: https://tickets.puppetlabs.com/browse/MODULES-4368
This commit is contained in:
Hunter Haugen
2017-06-07 16:15:47 -07:00
parent 1af563c6d5 c0227ce820
commit 49369bd48c
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/facter/java_default_home.rb
View File

@@ -15,7 +15,9 @@ Facter.add(:java_default_home) do
setcode do setcode do
if Facter::Util::Resolution.which('readlink') if Facter::Util::Resolution.which('readlink')
java_bin = Facter::Util::Resolution.exec('readlink -e /usr/bin/java').strip java_bin = Facter::Util::Resolution.exec('readlink -e /usr/bin/java').strip
if java_bin =~ %r(/jre/) if java_bin.empty?
nil
elsif java_bin =~ %r(/jre/)
java_default_home = File.dirname(File.dirname(File.dirname(java_bin))) java_default_home = File.dirname(File.dirname(File.dirname(java_bin)))
else else
java_default_home = File.dirname(File.dirname(java_bin)) java_default_home = File.dirname(File.dirname(java_bin))

8
spec/unit/facter/java_default_home_spec.rb
View File

@@ -29,6 +29,14 @@ describe Facter::Util::Fact do
end end
end end
end end
context 'returns nil when readlink is present but java is not' do
it do
java_path_output = ""
Facter::Util::Resolution.expects(:which).with("readlink").returns(true)
Facter::Util::Resolution.expects(:exec).with("readlink -e /usr/bin/java").returns(java_path_output)
expect(Facter.value(:java_default_home)).to be_nil
end
end
context 'returns nil when readlink not present' do context 'returns nil when readlink not present' do
it do it do