Merge pull request #2743 from Iristyle/ticket/stable/PUP-2364-fix-vardir-Windows-2003R2

(PUP-2364) Quote vardir to work on Windows 2003R2

Author: Kurt Wall

acceptance/tests/environment/use_enc_environment_for_pluginsync.rb

@@ -36,8 +36,8 @@
 
   agents.each do |agent|
     run_agent_on(agent, "--no-daemonize --onetime --server #{master}")
-    on agent, "cat #{agent.puppet['vardir']}/lib/puppet/foo.rb"
+    on agent, "cat \"#{agent.puppet['vardir']}/lib/puppet/foo.rb\""
     assert_match(/#special_version/, stdout, "The plugin from environment 'special' was not synced")
-    on agent, "rm -rf #{agent.puppet['vardir']}/lib"
+    on agent, "rm -rf \"#{agent.puppet['vardir']}/lib\""
   end
 end

acceptance/tests/pluginsync/files_earlier_in_modulepath_take_precendence.rb

@@ -42,7 +42,7 @@
 with_puppet_running_on master, master_opts, basedir do
   agents.each do |agent|
     on(agent, puppet('agent', "-t --server #{master}"))
-    on agent, "cat #{agent.puppet['vardir']}/lib/foo.rb" do
+    on agent, "cat \"#{agent.puppet['vardir']}/lib/foo.rb\"" do
       assert_match(/from the first module/, stdout, "The synced plugin was not found or the wrong version was synced")
     end
   end

acceptance/tests/ticket_6541_invalid_filebucket_files.rb

@@ -3,7 +3,7 @@
 agents.each do |agent|
   target=agent.tmpfile('6541-target')
 
-  on agent, host_command('rm -rf #{host.puppet["vardir"]}/*bucket')
+  on agent, host_command("rm -rf \"#{host.puppet['vardir']}/*bucket\"")
 
   step "write zero length file"
   manifest = "file { '#{target}': content => '' }"

acceptance/tests/ticket_6734_6256_5530_5503.rb

@@ -6,7 +6,7 @@
 
 with_puppet_running_on master, {} do
   step "Check permissions on puppet/rrd/"
-  on master, "ls -l #{master.puppet['vardir']} | grep rrd | awk '{print $3\" \"$4}'" do
+  on master, "ls -l \"#{master.puppet['vardir']}\" | grep rrd | awk '{print $3\" \"$4}'" do
     assert_match(/#{master['group']} #{master['group']}/, stdout, "puppet/rrd does not exist/wrong permissions")
   end
 end

acceptance/tests/ticket_9862_puppet_runs_without_service_user_or_group_present.rb

@@ -23,7 +23,7 @@ def missing_directory_for(agent, dir)
   agents.each do |agent|
     step "ensure puppet resets it's user/group settings"
     on agent, puppet('apply', '-e', '"notify { puppet_run: }"')
-    on agent, "find #{agent.puppet['vardir']} -user existinguser" do
+    on agent, "find \"#{agent.puppet['vardir']}\" -user existinguser" do
       assert_equal('',stdout)
     end
     on agent, puppet('resource', 'user', 'existinguser', 'ensure=absent')