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

1 files changed, 2 insertions, 3 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)