Skip to content

Commit

Permalink
Merge pull request #154 from socrata-cookbooks/jdk_8_warning
Browse files Browse the repository at this point in the history
Add safety check for JDK 8 on non-Oracle
  • Loading branch information
carmstrong committed Mar 22, 2014
2 parents 8d2de7a + b2c7cf6 commit 2f400ef
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 0 deletions.
4 changes: 4 additions & 0 deletions recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,9 @@
# limitations under the License.
#

if node['java']['jdk_version'].to_i == 8 and node['java']['install_flavor'] != 'oracle'
Chef::Application.fatal!("JDK 8 is currently only provided with the Oracle JDK")
end

include_recipe "java::set_attributes_from_version"
include_recipe "java::#{node['java']['install_flavor']}"
27 changes: 27 additions & 0 deletions spec/default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,31 @@
end
end

context 'Oracle JDK 8' do
let(:chef_run) do
runner = ChefSpec::Runner.new
runner.node.set['java']['install_flavor'] = 'oracle'
runner.node.set['java']['jdk_version'] = '8'
runner.converge(described_recipe)
end

it 'should not error' do
expect{chef_run}.to_not raise_error
end
end

context 'OpenJDK 8' do
let(:chef_run) do
runner = ChefSpec::Runner.new
runner.node.set['java']['install_flavor'] = 'openjdk'
runner.node.set['java']['jdk_version'] = '8'
runner.converge(described_recipe)
end

it 'should error' do
expect{chef_run}.to raise_error
end
end


end

0 comments on commit 2f400ef

Please sign in to comment.