aboutsummaryrefslogtreecommitdiffstats
path: root/test/rubygems
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-08 05:09:49 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-08 05:09:49 +0000
commitac277a45fa3a1f7530cda1a2e92dce1d473ae662 (patch)
treee8964f1fd628e97bcd25a36d49931bd9901629f8 /test/rubygems
parentd609757d4f36d1233fc9e3430f7bd1e58f61b3f7 (diff)
downloadruby-ac277a45fa3a1f7530cda1a2e92dce1d473ae662.tar.gz
test_gem_remote_fetcher.rb: terminate watcher
* test/rubygems/test_gem_remote_fetcher.rb (stop_servers): terminate timeout watcher thread to fix thread leak. re-apply r53439. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems')
-rw-r--r--test/rubygems/test_gem_remote_fetcher.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb
index f8d2cf2516..a0922b891f 100644
--- a/test/rubygems/test_gem_remote_fetcher.rb
+++ b/test/rubygems/test_gem_remote_fetcher.rb
@@ -924,6 +924,8 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
@ssl_server_thread.kill.join
@ssl_server_thread = nil
end
+ timeout = WEBrick::Utils::TimeoutHandler
+ timeout.terminate if defined?(timeout.terminate)
end
def normal_server_port