Merge pull request #70 from hunner/update_tests

Remove Sci 7 from readme and update oracle linux tests for ubuntu

README.markdown

@@ -74,7 +74,7 @@ OpenJDK is supported on:
 * Red Hat Enterprise Linux (RHEL) 5, 6, 7
 * CentOS 5, 6, 7
 * Oracle Linux 5, 6, 7
-* Scientific Linux 5, 6, 7
+* Scientific Linux 5, 6
 * Debian 6, 7
 * Ubuntu 10.04, 12.04, 14.04
 * Solaris 11

spec/acceptance/install_spec.rb

@@ -92,12 +92,17 @@ describe 'sun', :if => (fact('operatingsystem') == 'Debian' and fact('operatings
 end
 
 # C14704
-describe 'oracle', :if => (fact('operatingsystem') == 'Debian' and fact('operatingsystemrelease').match(/^7/)) do
+# 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/))
+) 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
-  # C14704
   describe 'jre' do
     it 'should install oracle-jre' do
       pp = <<-EOS
@@ -189,6 +194,7 @@ describe 'failure cases' do
   end
   # C14717
   # C14719
+  # C14725
   it 'should fail on debian when passed fake java_alternative and path' do
     pp = <<-EOS
       class { 'java':