diff options
| -rw-r--r-- | lib/puppet/indirector/indirection.rb | 4 | ||||
| -rwxr-xr-x | spec/unit/indirector/indirection.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/puppet/indirector/indirection.rb b/lib/puppet/indirector/indirection.rb index 606234dd0..05464f8c9 100644 --- a/lib/puppet/indirector/indirection.rb +++ b/lib/puppet/indirector/indirection.rb @@ -225,14 +225,14 @@ class Puppet::Indirector::Indirection request = request(:destroy, key, *args) terminus = prepare(request) - terminus.destroy(request) + result = terminus.destroy(request) if cache? and cached = cache.find(request(:find, key, *args)) # Reuse the existing request, since it's equivalent. cache.destroy(request) end - nil + result end # Search for more than one instance. Should always return an array. diff --git a/spec/unit/indirector/indirection.rb b/spec/unit/indirector/indirection.rb index e8ab9633b..cefd0557e 100755 --- a/spec/unit/indirector/indirection.rb +++ b/spec/unit/indirector/indirection.rb @@ -356,9 +356,9 @@ describe Puppet::Indirector::Indirection do it_should_behave_like "Indirection Delegator" it_should_behave_like "Delegation Authorizer" - it "should return nil" do - @terminus.stubs(:destroy) - @indirection.destroy("/my/key").should be_nil + it "should return the result of removing the instance" do + @terminus.stubs(:destroy).returns "yayness" + @indirection.destroy("/my/key").should == "yayness" end describe "when caching is enabled" do |