From a72be83df351021b11da7d2a34ff2ed0c0c7b98d Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 13 Jul 2015 13:48:22 -0700
Subject: [PATCH] Use the correct vardir in the tests

---
 spec/acceptance/concat_spec.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/acceptance/concat_spec.rb b/spec/acceptance/concat_spec.rb
index 2f7d4e3b2..2bceefc6d 100644
--- a/spec/acceptance/concat_spec.rb
+++ b/spec/acceptance/concat_spec.rb
@@ -5,7 +5,7 @@
     username = 'root'
     groupname = 'system'
     scriptname = 'concatfragments.rb'
-    vardir = default['puppetvardir']
+    vardir = default.puppet['vardir']
     if vardir.nil? or vardir == ''
       vardir = '/opt/puppetlabs/puppet/cache'
     end
@@ -13,7 +13,7 @@
     username = 'root'
     groupname = 'wheel'
     scriptname = 'concatfragments.rb'
-    vardir = default['puppetvardir']
+    vardir = default.puppet['vardir']
     if vardir.nil? or vardir == ''
       vardir = '/opt/puppetlabs/puppet/cache'
     end
@@ -21,13 +21,13 @@
     username = 'Administrator'
     groupname = 'Administrators'
     scriptname = 'concatfragments.rb'
-    result = on default, "echo #{default['puppetvardir']}"
+    result = on default, "echo #{default.puppet['vardir']}"
     vardir = result.raw_output.chomp
   when 'Solaris'
     username = 'root'
     groupname = 'root'
     scriptname = 'concatfragments.rb'
-    vardir = default['puppetvardir']
+    vardir = host.puppet['vardir']
     if vardir.nil? or vardir == ''
       vardir = '/opt/puppetlabs/puppet/cache'
     end
@@ -35,7 +35,7 @@
     username = 'root'
     groupname = 'root'
     scriptname = 'concatfragments.rb'
-    vardir = default['puppetvardir']
+    vardir = default.puppet['vardir']
     if vardir.nil? or vardir == ''
       vardir = '/opt/puppetlabs/puppet/cache'
     end