diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-05 06:09:17 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-05 06:09:17 +0000 |
commit | 8d66627161fab5cc65dfb702e3285eb4fef221e8 (patch) | |
tree | cc872fd6ae0ab0fa471a293a9dfb7706d226f883 /test/open-uri/test_open-uri.rb | |
parent | b01c28eeb3942bce1ddf9b9243ecf727d5421c6d (diff) | |
download | ruby-8d66627161fab5cc65dfb702e3285eb4fef221e8.tar.gz |
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/open-uri/test_open-uri.rb')
-rw-r--r-- | test/open-uri/test_open-uri.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/open-uri/test_open-uri.rb b/test/open-uri/test_open-uri.rb index b3702e6067..c64c2be324 100644 --- a/test/open-uri/test_open-uri.rb +++ b/test/open-uri/test_open-uri.rb @@ -43,6 +43,8 @@ class TestOpenURI < Test::Unit::TestCase } assert_join_threads([client_thread, server_thread2]) } + ensure + WEBrick::Utils::TimeoutHandler.terminate end def with_env(h) |