Changing the Cacher.invalidate method to Cacher.expire.

Signed-off-by: Luke Kanies <luke@madstop.com>

15 files changed, 17 insertions, 17 deletions

diff --git a/spec/integration/file_serving/configuration.rb b/spec/integration/file_serving/configuration.rb
index dfdda402d..06cf3abd9 100755
--- a/spec/integration/file_serving/configuration.rb
+++ b/spec/integration/file_serving/configuration.rb
@@ -10,7 +10,7 @@ require 'puppet/file_serving/configuration'
 describe Puppet::FileServing::Configuration, " when finding files with Puppet::FileServing::Mount" do
     before do
         # Just in case it already exists.
-        Puppet::Util::Cacher.invalidate
+        Puppet::Util::Cacher.expire
 
         @mount = Puppet::FileServing::Mount.new("mymount")
         FileTest.stubs(:exists?).with("/my/path").returns(true)
@@ -38,6 +38,6 @@ describe Puppet::FileServing::Configuration, " when finding files with Puppet::F
     end
 
     after do
-        Puppet::Util::Cacher.invalidate
+        Puppet::Util::Cacher.expire
     end
 end
diff --git a/spec/integration/file_serving/content.rb b/spec/integration/file_serving/content.rb
index af0181393..a51b36223 100755
--- a/spec/integration/file_serving/content.rb
+++ b/spec/integration/file_serving/content.rb
@@ -16,5 +16,5 @@ describe Puppet::FileServing::Content, " when finding files" do
         @indirection = Puppet::FileServing::Content.indirection
     end
 
-    after { Puppet::Util::Cacher.invalidate }
+    after { Puppet::Util::Cacher.expire }
 end
diff --git a/spec/integration/file_serving/metadata.rb b/spec/integration/file_serving/metadata.rb
index af3e16324..10c884f47 100755
--- a/spec/integration/file_serving/metadata.rb
+++ b/spec/integration/file_serving/metadata.rb
@@ -16,5 +16,5 @@ describe Puppet::FileServing::Metadata, " when finding files" do
         @indirection = Puppet::FileServing::Metadata.indirection
     end
 
-    after { Puppet::Util::Cacher.invalidate }
+    after { Puppet::Util::Cacher.expire }
 end
diff --git a/spec/integration/indirector/certificate/rest.rb b/spec/integration/indirector/certificate/rest.rb
index 0f14998d5..113cded4a 100755
--- a/spec/integration/indirector/certificate/rest.rb
+++ b/spec/integration/indirector/certificate/rest.rb
@@ -21,7 +21,7 @@ describe "Certificate REST Terminus" do
         Puppet.settings[:masterport] = "34343"
         Puppet.settings[:http_enable_post_connection_check] = false
 
-        Puppet::Util::Cacher.invalidate
+        Puppet::Util::Cacher.expire
 
         Puppet[:servertype] = 'webrick'
         Puppet[:server] = '127.0.0.1'
diff --git a/spec/integration/indirector/certificate_request/rest.rb b/spec/integration/indirector/certificate_request/rest.rb
index decd971dc..24c7e91c7 100755
--- a/spec/integration/indirector/certificate_request/rest.rb
+++ b/spec/integration/indirector/certificate_request/rest.rb
@@ -8,7 +8,7 @@ require 'puppet/network/http/webrick/rest'
 
 describe "Certificate Request REST Terminus" do
     before do
-        Puppet::Util::Cacher.invalidate
+        Puppet::Util::Cacher.expire
 
         Puppet[:masterport] = 34343
         Puppet[:server] = "localhost"
diff --git a/spec/integration/indirector/certificate_revocation_list/rest.rb b/spec/integration/indirector/certificate_revocation_list/rest.rb
index 872f4522c..bbe65c6c4 100755
--- a/spec/integration/indirector/certificate_revocation_list/rest.rb
+++ b/spec/integration/indirector/certificate_revocation_list/rest.rb
@@ -21,7 +21,7 @@ describe "Certificate REST Terminus" do
         Puppet.settings[:masterport] = "34343"
         Puppet.settings[:http_enable_post_connection_check] = false
 
-        Puppet::Util::Cacher.invalidate
+        Puppet::Util::Cacher.expire
 
         Puppet[:servertype] = 'webrick'
         Puppet[:server] = '127.0.0.1'
@@ -59,7 +59,7 @@ describe "Certificate REST Terminus" do
     end
 
     after do
-        Puppet::Util::Cacher.invalidate
+        Puppet::Util::Cacher.expire
         Puppet.settings.clear
         @server.unlisten
     end
diff --git a/spec/integration/indirector/rest.rb b/spec/integration/indirector/rest.rb
index 95c2759b9..aafc35c9b 100755
--- a/spec/integration/indirector/rest.rb
+++ b/spec/integration/indirector/rest.rb
@@ -57,7 +57,7 @@ describe Puppet::Indirector::REST do
 
     describe "when using webrick" do
         before :each do
-            Puppet::Util::Cacher.invalidate
+            Puppet::Util::Cacher.expire
 
             Puppet[:servertype] = 'webrick'
             Puppet[:server] = '127.0.0.1'
diff --git a/spec/integration/network/server/webrick.rb b/spec/integration/network/server/webrick.rb
index e74920782..5cd573141 100755
--- a/spec/integration/network/server/webrick.rb
+++ b/spec/integration/network/server/webrick.rb
@@ -30,7 +30,7 @@ describe Puppet::Network::Server do
 
             system("rm -rf %s" % @dir)
 
-            Puppet::Util::Cacher.invalidate
+            Puppet::Util::Cacher.expire
         end
 
         describe "before listening" do
diff --git a/spec/integration/node/catalog.rb b/spec/integration/node/catalog.rb
index 75be9501a..438f92834 100755
--- a/spec/integration/node/catalog.rb
+++ b/spec/integration/node/catalog.rb
@@ -7,7 +7,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Puppet::Node::Catalog do
     describe "when using the indirector" do
-        after { Puppet::Util::Cacher.invalidate }
+        after { Puppet::Util::Cacher.expire }
         before do
             # This is so the tests work w/out networking.
             Facter.stubs(:to_hash).returns({"hostname" => "foo.domain.com"})
diff --git a/spec/integration/node/facts.rb b/spec/integration/node/facts.rb
index 5a54a6e49..0a4d21ed6 100755
--- a/spec/integration/node/facts.rb
+++ b/spec/integration/node/facts.rb
@@ -7,7 +7,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Puppet::Node::Facts do
     describe "when using the indirector" do
-        after { Puppet::Util::Cacher.invalidate }
+        after { Puppet::Util::Cacher.expire }
 
         it "should expire any cached node instances when it is saved" do
             Puppet::Node::Facts.indirection.stubs(:terminus_class).returns :yaml
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
diff --git a/spec/integration/transaction/report.rb b/spec/integration/transaction/report.rb
index 6bbd5eb10..68533b503 100755
--- a/spec/integration/transaction/report.rb
+++ b/spec/integration/transaction/report.rb
@@ -7,7 +7,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Puppet::Transaction::Report do
     describe "when using the indirector" do
-        after { Puppet::Util::Cacher.invalidate }
+        after { Puppet::Util::Cacher.expire }
 
         it "should be able to delegate to the :processor terminus" do
             Puppet::Transaction::Report.indirection.stubs(:terminus_class).returns :processor