summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-05-25 16:01:26 -0500
committerLuke Kanies <luke@madstop.com>2008-05-25 16:01:26 -0500
commit6f533d11277dea2c57755cf379342a6bfb818eb8 (patch)
tree903816b78f1921227eeec618554179a425f247c1 /test
parent29f5f1b862112179ce1b77ae0177811ab2208aeb (diff)
downloadpuppet-6f533d11277dea2c57755cf379342a6bfb818eb8.tar.gz
puppet-6f533d11277dea2c57755cf379342a6bfb818eb8.tar.xz
puppet-6f533d11277dea2c57755cf379342a6bfb818eb8.zip
Fixing #1247 -- no more clear_cache failures.
I had clearly only run spec/ since this work.
Diffstat (limited to 'test')
-rwxr-xr-xtest/lib/puppettest.rb2
-rwxr-xr-xtest/network/handler/master.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index 6c1e059b8..1f4432d00 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -302,7 +302,7 @@ module PuppetTest
Puppet::Util::Storage.clear
Puppet.clear
Puppet.settings.clear
- Puppet::Indirector::Indirection.clear_cache
+ Puppet::Util::Cacher.invalidate
@memoryatend = Puppet::Util.memory
diff = @memoryatend - @memoryatstart
diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb
index e91ec2f47..14587e971 100755
--- a/test/network/handler/master.rb
+++ b/test/network/handler/master.rb
@@ -10,7 +10,7 @@ class TestMaster < Test::Unit::TestCase
def teardown
super
- Puppet::Indirector::Indirection.clear_cache
+ Puppet::Util::Cacher.invalidate
end
def test_freshness_is_always_now