Skip to content
This repository has been archived by the owner on Oct 15, 2022. It is now read-only.

Commit

Permalink
Merge pull request #30 from vrivellino/vince/appveyor-failures
Browse files Browse the repository at this point in the history
Fix failing tests on AppVeyor (windoze)
  • Loading branch information
vrivellino authored Mar 14, 2019
2 parents 89a5c8a + 689c03e commit 0a8f170
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions spec/unit/linux_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
context 'linux' do
context 'set_java_home' do
let(:chef_run) do
ChefSpec::SoloRunner.new(platform: 'debian', version: '8.8') do |node|
ChefSpec::SoloRunner.new(platform: 'debian', version: '8.11') do |node|
node.override['java_se']['java_home'] = '/opt/java'
end.converge(described_recipe)
end
Expand All @@ -30,7 +30,7 @@

context 'set_java_home_environment' do
let(:chef_run) do
ChefSpec::SoloRunner.new(platform: 'debian', version: '8.8') do |node|
ChefSpec::SoloRunner.new(platform: 'debian', version: '8.11') do |node|
node.override['java_se']['java_home'] = '/opt/java'
node.override['java_se']['set_etc_environment'] = true
end.converge(described_recipe)
Expand Down Expand Up @@ -121,7 +121,7 @@

context 'default_java_symlink' do
let(:chef_run) do
ChefSpec::SoloRunner.new(platform: 'debian', version: '8.8').converge(described_recipe)
ChefSpec::SoloRunner.new(platform: 'debian', version: '8.11').converge(described_recipe)
end

it 'symlinks /usr/lib/jvm/default-java' do
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/macosx_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
let(:shellout) { double(exitstatus: 1, run_command: nil, error!: nil, stdout: '') }

let(:chef_run) do
ChefSpec::SoloRunner.new(file_cache_path: CACHE, platform: 'mac_os_x', version: '10.10') do
ChefSpec::SoloRunner.new(file_cache_path: CACHE, platform: 'mac_os_x', version: '10.14') do
allow(Mixlib::ShellOut).to receive(:new).and_return(shellout)
end.converge(described_recipe)
end
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/skip_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
describe 'java_se::default' do
context 'skip install' do
let(:chef_run) do
ChefSpec::SoloRunner.new(platform: 'debian', version: '8.8') do |node|
ChefSpec::SoloRunner.new(platform: 'debian', version: '8.11') do |node|
node.override['java_se']['skip'] = true
end.converge(described_recipe)
end
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/windows_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
describe 'java_se::default' do
context 'windows' do
let(:chef_run) do
ChefSpec::SoloRunner.new(platform: 'windows', version: '2008R2') do |node|
ChefSpec::SoloRunner.new(platform: 'windows', version: '2012R2') do |node|
allow(::File).to receive(:exist?).and_call_original
allow(::File).to receive(:exist?).with("#{ENV['SYSTEMDRIVE']}\\java\\jdk").and_return(false)
ENV['SYSTEMDRIVE'] = 'C:'
Expand Down

0 comments on commit 0a8f170

Please sign in to comment.