summaryrefslogtreecommitdiffstats
path: root/spec/integration/file_serving
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-11-11 10:47:32 -0600
committerLuke Kanies <luke@madstop.com>2008-11-11 12:53:37 -0800
commit14af971bc618d665f481142934b2f612d503823c (patch)
tree08804f17e7b75110d0ea584583e235c8a4778cd0 /spec/integration/file_serving
parent99a0770a30c7c9a1349fd693cda31bdbf2717864 (diff)
downloadpuppet-14af971bc618d665f481142934b2f612d503823c.tar.gz
puppet-14af971bc618d665f481142934b2f612d503823c.tar.xz
puppet-14af971bc618d665f481142934b2f612d503823c.zip
Changing the Cacher.invalidate method to Cacher.expire.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'spec/integration/file_serving')
-rwxr-xr-xspec/integration/file_serving/configuration.rb4
-rwxr-xr-xspec/integration/file_serving/content.rb2
-rwxr-xr-xspec/integration/file_serving/metadata.rb2
3 files changed, 4 insertions, 4 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