Merge pull request #346 from mhaskel/aio_fix

Default test vardir to the aio paths for *nix systems
jguiditta · Jun 22, 2015 · b36f071 · b36f071
2 parents 8618076 + f654561
commit b36f071
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/spec/acceptance/concat_spec.rb b/spec/acceptance/concat_spec.rb
@@ -6,11 +6,17 @@
     groupname = 'system'
     scriptname = 'concatfragments.rb'
     vardir = default['puppetvardir']
+    if vardir == ''
+      vardir = '/opt/puppetlabs/puppet/cache'
+    end
   when 'Darwin'
     username = 'root'
     groupname = 'wheel'
     scriptname = 'concatfragments.rb'
     vardir = default['puppetvardir']
+    if vardir == ''
+      vardir = '/opt/puppetlabs/puppet/cache'
+    end
   when 'windows'
     username = 'Administrator'
     groupname = 'Administrators'
@@ -22,11 +28,17 @@
     groupname = 'root'
     scriptname = 'concatfragments.rb'
     vardir = default['puppetvardir']
+    if vardir == ''
+      vardir = '/opt/puppetlabs/puppet/cache'
+    end
   else
     username = 'root'
     groupname = 'root'
     scriptname = 'concatfragments.rb'
     vardir = default['puppetvardir']
+    if vardir == ''
+      vardir = '/opt/puppetlabs/puppet/cache'
+    end
 end
 
 describe 'basic concat test' do