summaryrefslogtreecommitdiffstats
path: root/test/network/handler
diff options
context:
space:
mode:
authorDominic Maraglia <dominic@puppetlabs.com>2011-08-03 15:43:20 -0700
committerDominic Maraglia <dominic@puppetlabs.com>2011-08-03 15:43:20 -0700
commite45f08bf1fef8842554ca0d8cb6fb13711e888e7 (patch)
tree9bb476a0fe381d53060abc1f1c240cf1291b2ee4 /test/network/handler
parenta97c86e7d01384aa06f5d4d69da427fc355aebe7 (diff)
parentc833fde370d43023f52c8f2e11fd77e720d0f577 (diff)
downloadpuppet-e45f08bf1fef8842554ca0d8cb6fb13711e888e7.tar.gz
puppet-e45f08bf1fef8842554ca0d8cb6fb13711e888e7.tar.xz
puppet-e45f08bf1fef8842554ca0d8cb6fb13711e888e7.zip
Merge branch 'master' of github.com:puppetlabs/puppet
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)