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

Merge pull request #94 from mhaskel/test_fix_89

Browse Source 
Test fix for RHEL with alternatives
This commit is contained in:
Hunter Haugen
2014-12-29 09:56:34 -08:00
parent 16ec5a40a7 ee9d955eeb
commit a0807a8c33
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/acceptance/install_spec.rb
View File

@@ -195,7 +195,7 @@ describe 'failure cases' do
# C14717 # C14717
# C14719 # C14719
# C14725 # C14725
it 'should fail on debian when passed fake java_alternative and path' do it 'should fail on debian or RHEL when passed fake java_alternative and path' do
pp = <<-EOS pp = <<-EOS
class { 'java': class { 'java':
java_alternative => 'whatever', java_alternative => 'whatever',
@@ -203,7 +203,7 @@ describe 'failure cases' do
} }
EOS EOS
if fact('osfamily') == 'Debian' if fact('osfamily') == 'Debian' or fact('osfamily') == 'RedHat'
apply_manifest(pp, :expect_failures => true) apply_manifest(pp, :expect_failures => true)
else else
apply_manifest(pp, :catch_failures => true) apply_manifest(pp, :catch_failures => true)