diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-01 16:18:41 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-01 16:18:41 +0000 |
commit | 8606377de4709ad53081d12b4640d69e9a0d4f28 (patch) | |
tree | af74bbe7fe2936a75625f0bcf33ac651b8c5a33e | |
parent | 061e4c3f7a29f8a0352256eab59ff9c3ae9ec7de (diff) | |
download | ruby-8606377de4709ad53081d12b4640d69e9a0d4f28.tar.gz |
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
-rw-r--r-- | test/rubygems/test_gem_remote_fetcher.rb | 9 |
1 files changed, 7 insertions, 2 deletions
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 |