From 8606377de4709ad53081d12b4640d69e9a0d4f28 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 1 Jul 2014 16:18:41 +0000 Subject: test_gem_remote_fetcher.rb: stop SSL server * test/rubygems/test_gem_remote_fetcher.rb (stop_servers): stop SSL server before shutdown its thread. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rubygems/test_gem_remote_fetcher.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'test/rubygems/test_gem_remote_fetcher.rb') diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb index aabd0c9308..1926c90e3b 100644 --- a/test/rubygems/test_gem_remote_fetcher.rb +++ b/test/rubygems/test_gem_remote_fetcher.rb @@ -723,9 +723,13 @@ gems: @proxy_server = nil end if @ssl_server - @ssl_server.kill.join + @ssl_server.stop @ssl_server = nil end + if @ssl_server_thread + @ssl_server_thread.kill.join + @ssl_server_thread = nil + end end def normal_server_port @@ -776,7 +780,8 @@ gems: raise end end - @ssl_server = t + @ssl_server = server + @ssl_server_thread = t server end -- cgit v1.2.3