Fixing executable tests to take new rundir into account

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2145 980ebf18-57e1-0310-9a29-db15c13687c0

3 files changed, 4 insertions, 2 deletions

diff --git a/lib/puppet/parser/ast/selector.rb b/lib/puppet/parser/ast/selector.rb
index f3d684a3d..e5eb3b6f5 100644
--- a/lib/puppet/parser/ast/selector.rb
+++ b/lib/puppet/parser/ast/selector.rb
@@ -69,5 +69,6 @@ class Puppet::Parser::AST
             ].join("\n")
         end
     end
-
 end
+
+# $Id$
diff --git a/test/executables/puppetd.rb b/test/executables/puppetd.rb
index ffe0b001e..9ae94b7c0 100755
--- a/test/executables/puppetd.rb
+++ b/test/executables/puppetd.rb
@@ -23,9 +23,9 @@ class TestPuppetDExe < Test::Unit::TestCase
         cmd = "puppetd"
         cmd += " --verbose"
         cmd += " --onetime"
-        #cmd += " --fqdn %s" % fqdn
         cmd += " --masterport %s" % @@port
         cmd += " --confdir %s" % Puppet[:confdir]
+        cmd += " --rundir %s" % File.join(Puppet[:vardir], "run")
         cmd += " --vardir %s" % Puppet[:vardir]
         cmd += " --server localhost"
 
diff --git a/test/lib/puppettest/exetest.rb b/test/lib/puppettest/exetest.rb
index 94e8ec8c9..c6beaf5ba 100644
--- a/test/lib/puppettest/exetest.rb
+++ b/test/lib/puppettest/exetest.rb
@@ -45,6 +45,7 @@ module PuppetTest::ExeTest
         manifest = mktestmanifest()
         args += " --manifest %s" % manifest
         args += " --confdir %s" % Puppet[:confdir]
+        args += " --rundir %s" % File.join(Puppet[:vardir], "run")
         args += " --vardir %s" % Puppet[:vardir]
         args += " --masterport %s" % @@port
         args += " --user %s" % Puppet::SUIDManager.uid