Fixed #1231 - Exceptions during startup should now be clear.

This will often result in duplicate information, but at least
the information will now always be there.

Signed-off-by: Luke Kanies <luke@madstop.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/spec/unit/util/settings.rb b/spec/unit/util/settings.rb
index de6d6457c..2a3c2afc7 100755
--- a/spec/unit/util/settings.rb
+++ b/spec/unit/util/settings.rb
@@ -696,11 +696,17 @@ describe Puppet::Util::Settings do
             @settings.reuse
         end
 
-        it "should fail if any resources fail" do
+        it "should fail with an appropriate message if any resources fail" do
             stub_transaction
             @trans.expects(:any_failed?).returns(true)
+            report = mock 'report'
+            @trans.expects(:report).returns report
 
-            proc { @settings.use(:whatever) }.should raise_error(RuntimeError)
+            log = mock 'log', :to_s => "My failure", :level => :err
+            report.expects(:logs).returns [log]
+
+            @settings.expects(:raise).with { |msg| msg.include?("My failure") }
+            @settings.use(:whatever)
         end
 
         after { Puppet::Type.allclear }