summaryrefslogtreecommitdiff
path: root/test/webrick/test_utils.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-05 06:09:17 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-05 06:09:17 +0000
commit8d66627161fab5cc65dfb702e3285eb4fef221e8 (patch)
treecc872fd6ae0ab0fa471a293a9dfb7706d226f883 /test/webrick/test_utils.rb
parentb01c28eeb3942bce1ddf9b9243ecf727d5421c6d (diff)
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
Diffstat (limited to 'test/webrick/test_utils.rb')
-rw-r--r--test/webrick/test_utils.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/test/webrick/test_utils.rb b/test/webrick/test_utils.rb
index 23996de5d2..c34ba8bb73 100644
--- a/test/webrick/test_utils.rb
+++ b/test/webrick/test_utils.rb
@@ -3,6 +3,11 @@ require "test/unit"
require "webrick/utils"
class TestWEBrickUtils < Test::Unit::TestCase
+ def teardown
+ WEBrick::Utils::TimeoutHandler.terminate
+ super
+ end
+
def assert_expired(m)
Thread.handle_interrupt(Timeout::Error => :never, EX => :never) do
assert_empty(m::TimeoutHandler.instance.instance_variable_get(:@timeout_info))