A round of bug-fixing in preparation for the next release.

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

4 files changed, 5 insertions, 6 deletions

diff --git a/test/executables/puppetbin.rb b/test/executables/puppetbin.rb
index 79fbd2358..bde9eaa8b 100755
--- a/test/executables/puppetbin.rb
+++ b/test/executables/puppetbin.rb
@@ -28,7 +28,6 @@ class TestPuppetBin < Test::Unit::TestCase
         if Puppet[:debug]
             cmd += " --debug"
         end
-        #cmd += " --fqdn %s" % fqdn
         cmd += " --confdir %s" % Puppet[:confdir]
         cmd += " --vardir %s" % Puppet[:vardir]
         unless Puppet[:debug]
@@ -36,7 +35,7 @@ class TestPuppetBin < Test::Unit::TestCase
         end
 
         assert_nothing_raised {
-            system(cmd + " " + file)
+            output = %x{#{cmd + " " + file} 2>&1}
         }
         assert($? == 0, "Puppet exited with code %s" % $?.to_i)
 
@@ -62,7 +61,7 @@ class TestPuppetBin < Test::Unit::TestCase
         cmd += " -e \"#{code}\""
 
         assert_nothing_raised {
-            system(cmd)
+            out = %x{#{cmd} 2>&1}
         }
         assert($? == 0, "Puppet exited with code %s" % $?.to_i)
 
diff --git a/test/executables/puppetca.rb b/test/executables/puppetca.rb
index 1248e0345..b722c963f 100755
--- a/test/executables/puppetca.rb
+++ b/test/executables/puppetca.rb
@@ -29,7 +29,7 @@ class TestPuppetCA < Test::Unit::TestCase
         if Puppet[:debug]
             debug = "-d "
         end
-        return %x{puppetca --user=#{Puppet[:user]} #{debug} --group=#{Puppet[:group]} --confdir=#{Puppet[:confdir]} #{args} 2>&1}
+        return %x{puppetca --user=#{Puppet[:user]} #{debug} --group=#{Puppet[:group]} --confdir=#{Puppet[:confdir]} --vardir=#{Puppet[:vardir]} #{args} 2>&1}
 
     end
 
diff --git a/test/executables/puppetd.rb b/test/executables/puppetd.rb
index bae91dc7d..700ea5bd3 100755
--- a/test/executables/puppetd.rb
+++ b/test/executables/puppetd.rb
@@ -34,7 +34,7 @@ class TestPuppetDExe < Test::Unit::TestCase
 
         # and verify our daemon runs
         assert_nothing_raised {
-            system(cmd)
+            %x{#{cmd} 2>&1}
         }
         sleep 1
         assert($? == 0, "Puppetd exited with code %s" % $?)
diff --git a/test/executables/puppetmodule.rb b/test/executables/puppetmodule.rb
index fcd85f42c..cff43a0e5 100755
--- a/test/executables/puppetmodule.rb
+++ b/test/executables/puppetmodule.rb
@@ -44,7 +44,7 @@ class TestPuppetModule < Test::Unit::TestCase
         ENV["CFALLCLASSES"] = "yaytest:all"
 
         assert_nothing_raised {
-            system(cmd + " " + file)
+            %x{#{cmd + " " + file} 2>&1}
         }
         assert($? == 0, "Puppet module exited with code %s" % $?.to_i)