Remove Puppet::Util::Cacher use from Puppet::Indirector::Indirection

Previously, indirections were storing their termini in a cached_attr, so that
they could be easily cleared for tests. Because this provides no value outside
of testing, we instead simply create an attr_reader for termini, and expire
them manually in tests.

Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/spec/integration/ssl/certificate_request_spec.rb b/spec/integration/ssl/certificate_request_spec.rb
index 31bb48d66..07a4d9269 100755
--- a/spec/integration/ssl/certificate_request_spec.rb
+++ b/spec/integration/ssl/certificate_request_spec.rb
@@ -28,14 +28,14 @@ describe Puppet::SSL::CertificateRequest, :fails_on_windows => true do
     @csr = Puppet::SSL::CertificateRequest.new("luke.madstop.com")
 
     @key = OpenSSL::PKey::RSA.new(512)
+
+    # This is necessary so the terminus instances don't lie around.
+    Puppet::SSL::CertificateRequest.indirection.termini.clear
   end
 
   after do
     system("rm -rf #{@dir}")
     Puppet.settings.clear
-
-    # This is necessary so the terminus instances don't lie around.
-    Puppet::Util::Cacher.expire
   end
 
   it "should be able to generate CSRs" do
diff --git a/spec/integration/ssl/certificate_revocation_list_spec.rb b/spec/integration/ssl/certificate_revocation_list_spec.rb
index 95f0e6314..5d2b102f5 100755
--- a/spec/integration/ssl/certificate_revocation_list_spec.rb
+++ b/spec/integration/ssl/certificate_revocation_list_spec.rb
@@ -29,7 +29,7 @@ describe Puppet::SSL::CertificateRevocationList, :fails_on_windows => true do
     Puppet.settings.clear
 
     # This is necessary so the terminus instances don't lie around.
-    Puppet::Util::Cacher.expire
+    Puppet::SSL::Host.indirection.termini.clear
   }
 
   it "should be able to read in written out CRLs with no revoked certificates" do