summaryrefslogtreecommitdiffstats
path: root/spec/integration/ssl
diff options
context:
space:
mode:
Diffstat (limited to 'spec/integration/ssl')
-rwxr-xr-xspec/integration/ssl/certificate_authority.rb2
-rwxr-xr-xspec/integration/ssl/certificate_request.rb2
-rwxr-xr-xspec/integration/ssl/certificate_revocation_list.rb2
-rwxr-xr-xspec/integration/ssl/host.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/spec/integration/ssl/certificate_authority.rb b/spec/integration/ssl/certificate_authority.rb
index d838bc586..5f963f7f5 100755
--- a/spec/integration/ssl/certificate_authority.rb
+++ b/spec/integration/ssl/certificate_authority.rb
@@ -28,7 +28,7 @@ describe Puppet::SSL::CertificateAuthority do
system("rm -rf %s" % @dir)
Puppet.settings.clear
- Puppet::Util::Cacher.invalidate
+ Puppet::Util::Cacher.expire
Puppet::SSL::CertificateAuthority.instance_variable_set("@instance", nil)
}
diff --git a/spec/integration/ssl/certificate_request.rb b/spec/integration/ssl/certificate_request.rb
index f428718e7..f1b2b8460 100755
--- a/spec/integration/ssl/certificate_request.rb
+++ b/spec/integration/ssl/certificate_request.rb
@@ -30,7 +30,7 @@ describe Puppet::SSL::CertificateRequest do
Puppet.settings.clear
# This is necessary so the terminus instances don't lie around.
- Puppet::Util::Cacher.invalidate
+ Puppet::Util::Cacher.expire
end
it "should be able to generate CSRs" do
diff --git a/spec/integration/ssl/certificate_revocation_list.rb b/spec/integration/ssl/certificate_revocation_list.rb
index 246654816..be1a5f4a1 100755
--- a/spec/integration/ssl/certificate_revocation_list.rb
+++ b/spec/integration/ssl/certificate_revocation_list.rb
@@ -28,7 +28,7 @@ describe Puppet::SSL::CertificateRevocationList do
Puppet.settings.clear
# This is necessary so the terminus instances don't lie around.
- Puppet::Util::Cacher.invalidate
+ Puppet::Util::Cacher.expire
}
it "should be able to read in written out CRLs with no revoked certificates" do
diff --git a/spec/integration/ssl/host.rb b/spec/integration/ssl/host.rb
index 65f10cef3..5b01e9f7e 100755
--- a/spec/integration/ssl/host.rb
+++ b/spec/integration/ssl/host.rb
@@ -29,7 +29,7 @@ describe Puppet::SSL::Host do
system("rm -rf %s" % @dir)
Puppet.settings.clear
- Puppet::Util::Cacher.invalidate
+ Puppet::Util::Cacher.expire
}
it "should be considered a CA host if its name is equal to 'ca'" do