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

Merge pull request #283 from HelenCampbell/javahometestfix

Browse Source 
Fixes java_home for SLES 11.4 and relevant tests
This commit is contained in:
TP Honey
2018-01-23 10:22:39 +00:00
committed by GitHub
parent c8ce18949b 85c17ef66f
commit 61cfbe3154
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/params.pp
View File

@@ -224,7 +224,7 @@ class java::params {
} elsif (versioncmp($::operatingsystemrelease, '11.4') >= 0) {
$jdk_package = 'java-1_7_1-ibm-devel'
$jre_package = 'java-1_7_1-ibm'
$java_home = '/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/'
$java_home = '/usr/lib64/jvm/java-1.7.1-ibm-1.7.1/'
} else {
$jdk_package = 'java-1_6_0-ibm-devel'
$jre_package = 'java-1_6_0-ibm'

2
spec/classes/java_spec.rb
View File

@@ -248,7 +248,7 @@ describe 'java', type: :class do
let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '11.4', architecture: 'x86_64' } }
it { is_expected.to contain_package('java').with_name('java-1_7_1-ibm-devel') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.1-ibm-1.7.1/') }
end
context 'when select default for SLES 12.0' do