diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-07-21 11:38:51 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-19 13:52:56 -0700 |
| commit | b6b54981bb0972ed6e57d5763e976418fe5bd32b (patch) | |
| tree | efacbaa6ba883c0327d9d231922d40516e68b39e /spec/integration | |
| parent | 777b2f284eceedb3bbc51846089278752074bfca (diff) | |
| download | puppet-b6b54981bb0972ed6e57d5763e976418fe5bd32b.tar.gz puppet-b6b54981bb0972ed6e57d5763e976418fe5bd32b.tar.xz puppet-b6b54981bb0972ed6e57d5763e976418fe5bd32b.zip | |
Remove Util::Cacher usage from SSL::CertificateAuthority
Allowing the singleton_instance value to be expirable is unnecessary, because
there will never be a need for a different CA instance in the lifetime of a
master. Additionally, the master never expired its cache anyway. This was only
using the cacher so it could be expired for tests, so it can safely be removed.
Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
(cherry picked from commit fac867c7bdbfbd431b089eb1bfb6eb73230e912c)
Diffstat (limited to 'spec/integration')
| -rwxr-xr-x | spec/integration/ssl/certificate_authority_spec.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/integration/ssl/certificate_authority_spec.rb b/spec/integration/ssl/certificate_authority_spec.rb index af06437c4..3069ee684 100755 --- a/spec/integration/ssl/certificate_authority_spec.rb +++ b/spec/integration/ssl/certificate_authority_spec.rb @@ -25,8 +25,6 @@ describe Puppet::SSL::CertificateAuthority, :fails_on_windows => true do system("rm -rf #{@dir}") Puppet.settings.clear - Puppet::Util::Cacher.expire - Puppet::SSL::CertificateAuthority.instance_variable_set("@instance", nil) } |