Revert the guts of #2890

This patch reverts the semantically significant parts of #2890 due to the
issues discussed on #3360 (security concerns when used with autosign,
inconsistency between REST & XMLRPC semantics) but leaves the semantically
neutral changes (code cleanup, added tests) in place.

This patch is intended for 0.25.x, but may also be applied as a step in the
resolution of #3450 (refactored #2890, add "remove_certs" flag) in Rolwf.

1 files changed, 17 insertions, 28 deletions

diff --git a/spec/unit/indirector/indirection.rb b/spec/unit/indirector/indirection.rb
index 0663fe55e..0f6fd13d5 100755
--- a/spec/unit/indirector/indirection.rb
+++ b/spec/unit/indirector/indirection.rb
@@ -545,44 +545,33 @@ describe Puppet::Indirector::Indirection do
                     @indirection.expire("/my/key")
                 end
 
-                describe "and the terminus supports removal of cache items with destroy" do
-                    it "should destroy the cached instance" do
-                        @cache.expects(:find).returns @cached
-                        @cache.expects(:destroy).with { |r| r.method == :destroy and r.key == "/my/key" }
-                        @cache.expects(:save).never
-                        @indirection.expire("/my/key")
-                    end
-                end
-
-                describe "and the terminus does not support removal of cache items with destroy" do
-                    it "should set the cached instance's expiration to a time in the past" do
-                        @cache.expects(:find).returns @cached
-                        @cache.stubs(:save)
+                it "should set the cached instance's expiration to a time in the past" do
+                    @cache.expects(:find).returns @cached
+                    @cache.stubs(:save)
 
-                        @cached.expects(:expiration=).with { |t| t < Time.now }
+                    @cached.expects(:expiration=).with { |t| t < Time.now }
 
-                        @indirection.expire("/my/key")
-                    end
+                    @indirection.expire("/my/key")
+                end
 
-                    it "should save the now expired instance back into the cache" do
-                        @cache.expects(:find).returns @cached
+                it "should save the now expired instance back into the cache" do
+                    @cache.expects(:find).returns @cached
 
-                        @cached.expects(:expiration=).with { |t| t < Time.now }
+                    @cached.expects(:expiration=).with { |t| t < Time.now }
 
-                        @cache.expects(:save)
+                    @cache.expects(:save)
 
-                        @indirection.expire("/my/key")
-                    end
+                    @indirection.expire("/my/key")
+                end
 
-                    it "should use a request to save the expired resource to the cache" do
-                        @cache.expects(:find).returns @cached
+                it "should use a request to save the expired resource to the cache" do
+                    @cache.expects(:find).returns @cached
 
-                        @cached.expects(:expiration=).with { |t| t < Time.now }
+                    @cached.expects(:expiration=).with { |t| t < Time.now }
 
-                        @cache.expects(:save).with { |r| r.is_a?(Puppet::Indirector::Request) and r.instance == @cached and r.method == :save }.returns(@cached)
+                    @cache.expects(:save).with { |r| r.is_a?(Puppet::Indirector::Request) and r.instance == @cached and r.method == :save }.returns(@cached)
 
-                        @indirection.expire("/my/key")
-                    end
+                    @indirection.expire("/my/key")
                 end
             end
         end