From 0d34450b0816a19592842201c70c66dcd746e06f Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 5 Jan 2016 06:09:17 +0000
Subject: leakchecker.rb: remove temporary measure

* lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler#watcher):
  make watcher thread restartable.

* lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler#terminate):
  new method to terminate watcher thread.

* test/lib/leakchecker.rb (LeakChecker#find_threads): revert
  r46941.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/webrick/test_httpproxy.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'test/webrick/test_httpproxy.rb')

diff --git a/test/webrick/test_httpproxy.rb b/test/webrick/test_httpproxy.rb
index 6837f0c738..335d442fbb 100644
--- a/test/webrick/test_httpproxy.rb
+++ b/test/webrick/test_httpproxy.rb
@@ -13,6 +13,11 @@ end
 require File.expand_path("utils.rb", File.dirname(__FILE__))
 
 class TestWEBrickHTTPProxy < Test::Unit::TestCase
+  def teardown
+    WEBrick::Utils::TimeoutHandler.terminate
+    super
+  end
+
   def test_fake_proxy
     assert_nil(WEBrick::FakeProxyURI.scheme)
     assert_nil(WEBrick::FakeProxyURI.host)
-- 
cgit v1.2.3