Merge pull request #349 from mhaskel/pe_next_fixes

Use the correct vardir in the tests
redhat-openstack · Jul 13, 2015 · 2f82480 · 2f82480
2 parents adb17a4 + a72be83
commit 2f82480
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/spec/acceptance/concat_spec.rb b/spec/acceptance/concat_spec.rb
@@ -5,37 +5,37 @@
     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
   when 'Darwin'
     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
   when 'windows'
     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
   else
     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