From 28cee40689440388994a4768bd301ae32c8ecc05 Mon Sep 17 00:00:00 2001 From: luke Date: Wed, 4 Oct 2006 18:24:24 +0000 Subject: Merging the changes from the override-refactor branch. This is a significant rewrite of the parser, but it has little affect on the rest of the code tree. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1726 980ebf18-57e1-0310-9a29-db15c13687c0 --- test/executables/puppetmodule.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'test/executables') diff --git a/test/executables/puppetmodule.rb b/test/executables/puppetmodule.rb index 0752fed14..6ffd84be3 100755 --- a/test/executables/puppetmodule.rb +++ b/test/executables/puppetmodule.rb @@ -34,16 +34,19 @@ class TestPuppetModule < Test::Unit::TestCase if Puppet[:debug] cmd += " --logdest %s" % "console" cmd += " --debug" + cmd += " --trace" else cmd += " --logdest %s" % "/dev/null" end ENV["CFALLCLASSES"] = "yaytest:all" + libsetup + out = nil assert_nothing_raised { - %x{#{cmd + " " + file} 2>&1} + out = %x{#{cmd + " " + file} 2>&1} } - assert($? == 0, "Puppet module exited with code %s" % $?.to_i) + assert($? == 0, "Puppet module exited with code %s: %s" % [$?.to_i, out]) assert(FileTest.exists?(createdfile), "Failed to create config'ed file") end -- cgit