summaryrefslogtreecommitdiffstats
path: root/test/executables/puppetd.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-06-13 15:57:06 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-06-13 15:57:06 +0000
commitec0609d81cb5f2b44fce7174b72dd2c5a06dfbe6 (patch)
treea20175019bd423232062925f860f2b2fb0408c0f /test/executables/puppetd.rb
parent9af5d697385fd28843d1603e9e6afd272ec5e560 (diff)
downloadpuppet-ec0609d81cb5f2b44fce7174b72dd2c5a06dfbe6.tar.gz
puppet-ec0609d81cb5f2b44fce7174b72dd2c5a06dfbe6.tar.xz
puppet-ec0609d81cb5f2b44fce7174b72dd2c5a06dfbe6.zip
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
Diffstat (limited to 'test/executables/puppetd.rb')
-rwxr-xr-xtest/executables/puppetd.rb2
1 files changed, 1 insertions, 1 deletions
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" % $?)