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

Merge pull request #38 from brettporter/scientific

Browse Source 
Support Scientific Linux
This commit is contained in:
Brett Porter
2013-09-25 21:03:32 -07:00
parent f8c07504bb 304a4343ab
commit 6f91a2f8ab
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@@ -1,3 +1,8 @@
1.0.2 ()
Brett Porter <brett@apache.org>
* Support Scientific Linux
1.0.1 (2013-08-01) 1.0.1 (2013-08-01)
Matthaus Owens <matthaus@puppetlabs.com> Matthaus Owens <matthaus@puppetlabs.com>

6
spec/classes/java_spec.rb
View File

@@ -101,6 +101,12 @@ describe 'java', :type => :class do
it { should contain_package('java').with_name('java-1.7.0-openjdk') } it { should contain_package('java').with_name('java-1.7.0-openjdk') }
end end
context 'select passed value for Scientific Linux' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Scientific', :operatingsystemrelease => '6.4'} }
let(:params) { { 'distribution' => 'jre' } }
it { should contain_package('java').with_name('java-1.7.0-openjdk') }
end
context 'select default for OpenSUSE 12.3' do context 'select default for OpenSUSE 12.3' do
let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3'}} let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3'}}
it { should contain_package('java').with_name('java-1_7_0-openjdk-devel')} it { should contain_package('java').with_name('java-1_7_0-openjdk-devel')}