From 045a03461dbeece30f58e23933891bde2710fbf1 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Fri, 19 Aug 2016 13:25:38 -0700 Subject: [PATCH 1/2] Require the latest berkshelf and test-kitchen Signed-off-by: Tim Smith --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 886eff8e..5f52e817 100644 --- a/Gemfile +++ b/Gemfile @@ -18,8 +18,8 @@ group :test do end group :integration do - gem 'berkshelf', '~> 4.0' - gem 'test-kitchen', '~> 1.4' + gem 'berkshelf', '~> 4.3' + gem 'test-kitchen', '~> 1.11' gem 'kitchen-vagrant' end From 87c1ae15b2ed9626c3a02466efa3145a1bcbd815 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Fri, 19 Aug 2016 13:26:00 -0700 Subject: [PATCH 2/2] Use root_groupt to simplify test recipe Signed-off-by: Tim Smith --- test/integration/cookbooks/test/recipes/prep_files.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/integration/cookbooks/test/recipes/prep_files.rb b/test/integration/cookbooks/test/recipes/prep_files.rb index 4ed857a6..ca4a9a1d 100644 --- a/test/integration/cookbooks/test/recipes/prep_files.rb +++ b/test/integration/cookbooks/test/recipes/prep_files.rb @@ -5,9 +5,7 @@ # Helper recipe to create create a few files in the operating # systems, which the runner will test against. -gid = 'root' -gid = 'wheel' if node['platform_family'] == 'freebsd' -gid = 'system' if node['platform_family'] == 'aix' +gid = node['platform_family'] == 'aix' ? 'system' : node['root_group'] file '/tmp/file' do mode '0765'