Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(PDK-1522) Update package tests for OSX 10.15 #852

Merged
merged 1 commit into from
Feb 18, 2020
Merged

(PDK-1522) Update package tests for OSX 10.15 #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-testing/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ end

gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '= 4.10.0')
gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '= 0.5.0')
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '= 1.1.44')
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '= 1.2.3')
gem 'beaker-puppet', '= 1.18.5'
gem 'beaker-rspec', '= 6.2.4'
gem 'beaker-vmpooler', '= 1.3.3'
Expand Down
13 changes: 10 additions & 3 deletions package-testing/spec/package/support/spec_utils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,16 @@ def install_dir(cygpath = false)
end

def home_dir(cygpath = false)
return '/root' unless windows_node?

cygpath ? '/home/Administrator' : 'c:/cygwin64/home/Administrator'
if windows_node?
cygpath ? '/home/Administrator' : 'c:/cygwin64/home/Administrator'
else
case get_working_node.platform
when %r{\Aosx-10\.15-}
'/var/root'
else
'/root'
end
end
end

def windows_node?
Expand Down