diff --git a/package-testing/Gemfile b/package-testing/Gemfile index 846d1d4cb..c140cb930 100644 --- a/package-testing/Gemfile +++ b/package-testing/Gemfile @@ -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' diff --git a/package-testing/spec/package/support/spec_utils.rb b/package-testing/spec/package/support/spec_utils.rb index 567882de3..a40573fa0 100644 --- a/package-testing/spec/package/support/spec_utils.rb +++ b/package-testing/spec/package/support/spec_utils.rb @@ -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?