diff options
| -rw-r--r-- | lib/puppet/network/http/handler.rb | 2 | ||||
| -rw-r--r-- | spec/integration/indirector/rest.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb index b5dcf69d4..f226ae133 100644 --- a/lib/puppet/network/http/handler.rb +++ b/lib/puppet/network/http/handler.rb @@ -53,7 +53,7 @@ module Puppet::Network::HTTP::Handler end def do_exception(request, response, exception, status=404) - encode_result(request, response, exception.to_s, status) + encode_result(request, response, exception.to_yaml, status) end def find_model_for_handler(handler) diff --git a/spec/integration/indirector/rest.rb b/spec/integration/indirector/rest.rb index aed17d977..9ac2bc997 100644 --- a/spec/integration/indirector/rest.rb +++ b/spec/integration/indirector/rest.rb @@ -79,9 +79,9 @@ describe Puppet::Indirector::REST do Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:model).returns(@mock_model) end - # it "should raise an exception" do - # lambda { Puppet::TestIndirectedFoo.find('bar') }.should raise_error(RuntimeError) - # end + it "should raise an exception" do + lambda { Puppet::TestIndirectedFoo.find('bar') }.should raise_error(RuntimeError) + end end end |