From 9849d565ec4db6bf1a39413c3136da9713f9fa25 Mon Sep 17 00:00:00 2001 From: Nick Lewis Date: Thu, 21 Jul 2011 11:52:50 -0700 Subject: Remove use of Puppet::Util::Cacher in Puppet::SSL::Host This class was previously using a cached_attr for its 'localhost' attribute, representing the Puppet::SSL::Host entry corresponding to the cert in Puppet[:certname]. We now no longer expire this attribute. This has the effect that a change to certname during the lifetime of an agent will not be reflected in the certificate it uses. If this behavior is desired, it will need to be reimplemented another way. Reviewed-By: Jacob Helwig (cherry picked from commit 7048b4c4d8c4a8ad45caf6a02b263ac0a9fa333e) --- spec/unit/ssl/host_spec.rb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'spec') diff --git a/spec/unit/ssl/host_spec.rb b/spec/unit/ssl/host_spec.rb index e1680941f..f00451619 100755 --- a/spec/unit/ssl/host_spec.rb +++ b/spec/unit/ssl/host_spec.rb @@ -13,7 +13,7 @@ describe Puppet::SSL::Host, :fails_on_windows => true do after do # Cleaned out any cached localhost instance. - Puppet::Util::Cacher.expire + Puppet::SSL::Host.instance_variable_set(:@localhost, nil) Puppet::SSL::Host.ca_location = :none end @@ -82,16 +82,6 @@ describe Puppet::SSL::Host, :fails_on_windows => true do Puppet::SSL::Host.localhost.should == Puppet::SSL::Host.localhost end - it "should be able to expire the cached instance" do - one = stub 'host1', :certificate => "eh", :key => 'foo' - two = stub 'host2', :certificate => "eh", :key => 'foo' - Puppet::SSL::Host.expects(:new).times(2).returns(one).then.returns(two) - - Puppet::SSL::Host.localhost.should equal(one) - Puppet::Util::Cacher.expire - Puppet::SSL::Host.localhost.should equal(two) - end - it "should be able to verify its certificate matches its key" do Puppet::SSL::Host.new("foo").should respond_to(:certificate_matches_key?) end -- cgit