Cleanup ruby code via rubocop
This commit will add code cleanup as corrected and alerted by rubocop. It also adds rules to execute rubocop on Travis.
This commit is contained in:
Will Meek
@@ -1,13 +1,13 @@
|
||||
require 'spec_helper_acceptance'
|
||||
|
||||
#RedHat, CentOS, Scientific, Oracle prior to 5.0 : Sun Java JDK/JRE 1.6
|
||||
#RedHat, CentOS, Scientific, Oracle 5.0 < x < 6.3 : OpenJDK Java JDK/JRE 1.6
|
||||
#RedHat, CentOS, Scientific, Oracle after 6.3 : OpenJDK Java JDK/JRE 1.7
|
||||
#Debian 5/6 & Ubuntu 10.04/11.04 : OpenJDK Java JDK/JRE 1.6 or Sun Java JDK/JRE 1.6
|
||||
#Debian 7/Jesse & Ubuntu 12.04 - 14.04 : OpenJDK Java JDK/JRE 1.7 or Oracle Java JDK/JRE 1.6
|
||||
#Solaris (what versions?) : Java JDK/JRE 1.7
|
||||
#OpenSuSE : OpenJDK Java JDK/JRE 1.7
|
||||
#SLES : IBM Java JDK/JRE 1.6
|
||||
# RedHat, CentOS, Scientific, Oracle prior to 5.0 : Sun Java JDK/JRE 1.6
|
||||
# RedHat, CentOS, Scientific, Oracle 5.0 < x < 6.3 : OpenJDK Java JDK/JRE 1.6
|
||||
# RedHat, CentOS, Scientific, Oracle after 6.3 : OpenJDK Java JDK/JRE 1.7
|
||||
# Debian 5/6 & Ubuntu 10.04/11.04 : OpenJDK Java JDK/JRE 1.6 or Sun Java JDK/JRE 1.6
|
||||
# Debian 7/Jesse & Ubuntu 12.04 - 14.04 : OpenJDK Java JDK/JRE 1.7 or Oracle Java JDK/JRE 1.6
|
||||
# Solaris (what versions?) : Java JDK/JRE 1.7
|
||||
# OpenSuSE : OpenJDK Java JDK/JRE 1.7
|
||||
# SLES : IBM Java JDK/JRE 1.6
|
||||
|
||||
# C14677
|
||||
# C14678
|
||||
@@ -26,74 +26,103 @@ require 'spec_helper_acceptance'
|
||||
# C14723 Where is oracle linux 5?
|
||||
# C14724 Where is oracle linux 5?
|
||||
# C14771 Where is redhat 7? Centos 7?
|
||||
describe "installing java", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
|
||||
describe "jre" do
|
||||
it 'should install jre' do
|
||||
pp = <<-EOS
|
||||
class { 'java':
|
||||
distribution => 'jre',
|
||||
}
|
||||
EOS
|
||||
|
||||
# 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
|
||||
describe "jdk" do
|
||||
it 'should install jdk' do
|
||||
pp = <<-EOS
|
||||
class { 'java': }
|
||||
EOS
|
||||
java_class_jre = "class { 'java':\n"\
|
||||
" distribution => 'jre',\n"\
|
||||
'}'
|
||||
|
||||
apply_manifest(pp, :catch_failures => true)
|
||||
apply_manifest(pp, :catch_changes => true)
|
||||
end
|
||||
java_class = "class { 'java': }"
|
||||
|
||||
sources = "file_line { 'non-free source':\n"\
|
||||
" path => '/etc/apt/sources.list',\n"\
|
||||
" match => \"deb http://osmirror.delivery.puppetlabs.net/debian/ ${::lsbdistcodename} main\",\n"\
|
||||
" line => \"deb http://osmirror.delivery.puppetlabs.net/debian/ ${::lsbdistcodename} main non-free\",\n"\
|
||||
'}'
|
||||
|
||||
sun_jre = "class { 'java':\n"\
|
||||
" distribution => 'sun-jre',\n"\
|
||||
'}'
|
||||
|
||||
sun_jdk = "class { 'java':\n"\
|
||||
" distribution => 'sun-jdk',\n"\
|
||||
'}'
|
||||
|
||||
oracle_jre = "class { 'java':\n"\
|
||||
" distribution => 'oracle-jre',\n"\
|
||||
'}'
|
||||
|
||||
oracle_jdk = "class { 'java':\n"\
|
||||
" distribution => 'oracle-jdk',\n"\
|
||||
'}'
|
||||
|
||||
incorrect_version = "class { 'java':\n"\
|
||||
" version => '14.5',\n"\
|
||||
'}'
|
||||
|
||||
blank_version = "class { 'java':\n"\
|
||||
" version => '',\n"\
|
||||
'}'
|
||||
|
||||
incorrect_distro = "class { 'java':\n"\
|
||||
" distribution => 'xyz',\n"\
|
||||
'}'
|
||||
|
||||
blank_distro = "class { 'java':\n"\
|
||||
" distribution => '',\n"\
|
||||
'}'
|
||||
|
||||
incorrect_package = "class { 'java':\n"\
|
||||
" package => 'xyz',\n"\
|
||||
'}'
|
||||
|
||||
bogus_alternative = "class { 'java':\n"\
|
||||
" java_alternative => 'whatever',\n"\
|
||||
" java_alternative_path => '/whatever',\n"\
|
||||
'}'
|
||||
|
||||
def apply_manifest_wheezy_case(pp)
|
||||
# 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' && fact('lsbdistcodename') == 'wheezy'
|
||||
apply_manifest(pp)
|
||||
else
|
||||
apply_manifest(pp, catch_failures: true)
|
||||
end
|
||||
end
|
||||
|
||||
context 'installing java jre', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
|
||||
it 'installs jre' do
|
||||
apply_manifest_wheezy_case(java_class_jre)
|
||||
apply_manifest(java_class_jre, catch_changes: true)
|
||||
end
|
||||
end
|
||||
|
||||
context 'installing java jdk', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
|
||||
it 'installs jdk' do
|
||||
apply_manifest(java_class, catch_failures: true)
|
||||
apply_manifest(java_class, catch_changes: true)
|
||||
end
|
||||
end
|
||||
|
||||
# C14686
|
||||
describe 'sun', :if => (fact('operatingsystem') == 'Debian' and fact('operatingsystemrelease').match(/(5|6)/)) do
|
||||
context 'sun', if: (fact('operatingsystem') == 'Debian' && fact('operatingsystemrelease').match(%r{(5|6)})) do
|
||||
before :all do
|
||||
pp = <<-EOS
|
||||
file_line { 'non-free source':
|
||||
path => '/etc/apt/sources.list',
|
||||
match => "deb http://osmirror.delivery.puppetlabs.net/debian/ ${::lsbdistcodename} main",
|
||||
line => "deb http://osmirror.delivery.puppetlabs.net/debian/ ${::lsbdistcodename} main non-free",
|
||||
}
|
||||
EOS
|
||||
apply_manifest(pp)
|
||||
apply_manifest(sources)
|
||||
shell('apt-get update')
|
||||
shell('echo "sun-java6-jdk shared/accepted-sun-dlj-v1-1 select true" | debconf-set-selections')
|
||||
shell('echo "sun-java6-jre shared/accepted-sun-dlj-v1-1 select true" | debconf-set-selections')
|
||||
end
|
||||
describe 'jre' do
|
||||
it 'should install sun-jre' do
|
||||
pp = <<-EOS
|
||||
class { 'java':
|
||||
distribution => 'sun-jre',
|
||||
}
|
||||
EOS
|
||||
|
||||
apply_manifest(pp, :catch_failures => true)
|
||||
apply_manifest(pp, :catch_changes => true)
|
||||
it 'installs sun-jre' do
|
||||
apply_manifest(sun_jre, catch_failures: true)
|
||||
apply_manifest(sun_jre, catch_changes: true)
|
||||
end
|
||||
end
|
||||
describe 'jdk' do
|
||||
it 'should install sun-jdk' do
|
||||
pp = <<-EOS
|
||||
class { 'java':
|
||||
distribution => 'sun-jdk',
|
||||
}
|
||||
EOS
|
||||
|
||||
apply_manifest(pp, :catch_failures => true)
|
||||
apply_manifest(pp, :catch_changes => true)
|
||||
it 'installs sun-jdk' do
|
||||
apply_manifest(sun_jdk, catch_failures: true)
|
||||
apply_manifest(sun_jdk, catch_changes: true)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -101,122 +130,64 @@ end
|
||||
# C14704
|
||||
# C14705
|
||||
# C15006
|
||||
describe 'oracle', :if => (
|
||||
(fact('operatingsystem') == 'Debian') and (fact('operatingsystemrelease').match(/^7/)) or
|
||||
(fact('operatingsystem') == 'Ubuntu') and (fact('operatingsystemrelease').match(/^12\.04/)) or
|
||||
(fact('operatingsystem') == 'Ubuntu') and (fact('operatingsystemrelease').match(/^14\.04/))
|
||||
context 'oracle', if: (
|
||||
(fact('operatingsystem') == 'Debian') && fact('operatingsystemrelease').match(%r{^7}) ||
|
||||
(fact('operatingsystem') == 'Ubuntu') && fact('operatingsystemrelease').match(%r{^12\.04}) ||
|
||||
(fact('operatingsystem') == 'Ubuntu') && fact('operatingsystemrelease').match(%r{^14\.04})
|
||||
) do
|
||||
# not supported
|
||||
# The package is not available from any sources, but if a customer
|
||||
# custom-builds the package using java-package and adds it to a local
|
||||
# repository, that is the intention of this version ability
|
||||
describe 'jre' do
|
||||
it 'should install oracle-jre' do
|
||||
pp = <<-EOS
|
||||
class { 'java':
|
||||
distribution => 'oracle-jre',
|
||||
}
|
||||
EOS
|
||||
|
||||
apply_manifest(pp, :expect_failures => true)
|
||||
it 'installs oracle-jre' do
|
||||
apply_manifest(oracle_jre, expect_failures: true)
|
||||
end
|
||||
end
|
||||
describe 'jdk' do
|
||||
it 'should install oracle-jdk' do
|
||||
pp = <<-EOS
|
||||
class { 'java':
|
||||
distribution => 'oracle-jdk',
|
||||
}
|
||||
EOS
|
||||
|
||||
apply_manifest(pp, :expect_failures => true)
|
||||
it 'installs oracle-jdk' do
|
||||
apply_manifest(oracle_jdk, expect_failures: true)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'failure cases' do
|
||||
context 'failure cases' do
|
||||
# C14711
|
||||
# SLES 10 returns an exit code of 0 on zypper failure
|
||||
unless fact('operatingsystem') == 'SLES' and fact('operatingsystemrelease') < '11'
|
||||
it 'should fail to install java with an incorrect version' do
|
||||
pp = <<-EOS
|
||||
class { 'java':
|
||||
version => '14.5',
|
||||
}
|
||||
EOS
|
||||
|
||||
apply_manifest(pp, :expect_failures => true)
|
||||
unless fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') < '11'
|
||||
it 'fails to install java with an incorrect version' do
|
||||
apply_manifest(incorrect_version, expect_failures: true)
|
||||
end
|
||||
end
|
||||
|
||||
# C14712
|
||||
it 'should fail to install java with a blank version' do
|
||||
pp = <<-EOS
|
||||
class { 'java':
|
||||
version => '',
|
||||
}
|
||||
EOS
|
||||
|
||||
apply_manifest(pp, :expect_failures => true)
|
||||
it 'fails to install java with a blank version' do
|
||||
apply_manifest(blank_version, expect_failures: true)
|
||||
end
|
||||
|
||||
# C14713
|
||||
it 'should fail to install java with an incorrect distribution' do
|
||||
pp = <<-EOS
|
||||
class { 'java':
|
||||
distribution => 'xyz',
|
||||
}
|
||||
EOS
|
||||
|
||||
apply_manifest(pp, :expect_failures => true)
|
||||
it 'fails to install java with an incorrect distribution' do
|
||||
apply_manifest(incorrect_distro, expect_failures: true)
|
||||
end
|
||||
|
||||
# C14714
|
||||
it 'should fail to install java with a blank distribution' do
|
||||
pp = <<-EOS
|
||||
class { 'java':
|
||||
distribution => '',
|
||||
}
|
||||
EOS
|
||||
|
||||
apply_manifest(pp, :expect_failures => true)
|
||||
it 'fails to install java with a blank distribution' do
|
||||
apply_manifest(blank_distro, expect_failures: true)
|
||||
end
|
||||
|
||||
# C14715
|
||||
it 'should fail to install java with an incorrect package' do
|
||||
pp = <<-EOS
|
||||
class { 'java':
|
||||
package => 'xyz',
|
||||
}
|
||||
EOS
|
||||
|
||||
apply_manifest(pp, :expect_failures => true)
|
||||
it 'fails to install java with an incorrect package' do
|
||||
apply_manifest(incorrect_package, expect_failures: true)
|
||||
end
|
||||
# C14715
|
||||
it 'should fail to install java with an incorrect package' do
|
||||
pp = <<-EOS
|
||||
class { 'java':
|
||||
package => 'xyz',
|
||||
}
|
||||
EOS
|
||||
|
||||
apply_manifest(pp, :expect_failures => true)
|
||||
end
|
||||
# C14717
|
||||
# C14719
|
||||
# C14725
|
||||
it 'should fail on debian or RHEL when passed fake java_alternative and path' do
|
||||
pp = <<-EOS
|
||||
class { 'java':
|
||||
java_alternative => 'whatever',
|
||||
java_alternative_path => '/whatever',
|
||||
}
|
||||
EOS
|
||||
|
||||
if fact('osfamily') == 'Debian' or fact('osfamily') == 'RedHat'
|
||||
apply_manifest(pp, :expect_failures => true)
|
||||
it 'fails on debian or RHEL when passed fake java_alternative and path' do
|
||||
if fact('osfamily') == 'Debian' || fact('osfamily') == 'RedHat'
|
||||
apply_manifest(bogus_alternative, expect_failures: true)
|
||||
else
|
||||
apply_manifest(pp, :catch_failures => true)
|
||||
apply_manifest(bogus_alternative, catch_failures: true)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user