summaryrefslogtreecommitdiffstats
path: root/test/network/handler
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-07-21 20:21:41 -0700
committerNick Lewis <nick@puppetlabs.com>2011-07-21 20:21:41 -0700
commitc5d70ed11f8f964523ca049d6c3d504de3840c1a (patch)
tree6f1872676315dde67aa865d5d177e18bdcf6e4a3 /test/network/handler
parent9c78759af57967d64eceeeb704a6673b81a76f30 (diff)
parentd198fedf65e472b384666fc9ae3bef487852068a (diff)
downloadpuppet-c5d70ed11f8f964523ca049d6c3d504de3840c1a.tar.gz
puppet-c5d70ed11f8f964523ca049d6c3d504de3840c1a.tar.xz
puppet-c5d70ed11f8f964523ca049d6c3d504de3840c1a.zip
Merge branch 'remove-cacher'
Diffstat (limited to 'test/network/handler')
-rwxr-xr-xtest/network/handler/master.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb
index 4c0374a76..9326e4b38 100755
--- a/test/network/handler/master.rb
+++ b/test/network/handler/master.rb
@@ -16,11 +16,6 @@ class TestMaster < Test::Unit::TestCase
Puppet::Resource::Catalog.indirection.stubs(:find).returns(@catalog)
end
- def teardown
- super
- Puppet::Util::Cacher.expire
- end
-
def test_freshness_is_always_now
now1 = mock 'now1'
Time.stubs(:now).returns(now1)