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

Merge pull request #60 from puppetlabs/empty_package

Browse Source 
Remove empty package test and validation
This commit is contained in:
Hunter Haugen
2014-08-13 13:12:29 -07:00
parent 230ab22adf dcdc96187d
commit 8d1b89b43d
2 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/init.pp
View File

@@ -47,9 +47,6 @@ class java(
include java::params include java::params
validate_re($version, 'present|installed|latest|^[.+_0-9a-zA-Z:-]+$') validate_re($version, 'present|installed|latest|^[.+_0-9a-zA-Z:-]+$')
if $package != undef {
validate_slength($package,255,1)
}
if has_key($java::params::java, $distribution) { if has_key($java::params::java, $distribution) {
$default_package_name = $java::params::java[$distribution]['package'] $default_package_name = $java::params::java[$distribution]['package']

24
spec/acceptance/install_spec.rb
View File

@@ -173,28 +173,4 @@ describe 'failure cases' do
apply_manifest(pp, :expect_failures => true) apply_manifest(pp, :expect_failures => true)
end end
# C14716
it 'should fail to install java with a blank package' do
pp = <<-EOS
class { 'java':
package => '',
}
EOS
apply_manifest(pp, :expect_failures => true)
end
context 'non-debian systems', :if => fact('osfamily') != 'Debian' do
# C14717
it 'should fail to install java with a blank package' do
pp = <<-EOS
class { 'java':
package => '',
}
EOS
apply_manifest(pp, :expect_failures => true)
end
end
end end