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

Merge pull request #96 from mhaskel/wheezy_test_fix

Browse Source 
Acceptance test fix for wheezy
This commit is contained in:
Travis Fields
2014-12-29 17:28:00 -08:00
parent bac6b37e64 619cdf99c4
commit 55ca769bc2
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spec/acceptance/install_spec.rb
View File

@@ -35,7 +35,14 @@ describe "installing java", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfa
}
EOS
apply_manifest(pp, :catch_failures => true)
# With the version of java that ships with pe on debian wheezy, update-alternatives
# throws an error on the first run due to missing alternative for policytool. It still
# updates the alternatives for java
if fact('operatingsystem') == 'Debian' and fact('lsbdistcodename') == 'wheezy'
apply_manifest(pp)
else
apply_manifest(pp, :catch_failures => true)
end
apply_manifest(pp, :catch_changes => true)
end
end