[前][次][番号順一覧][スレッド一覧]

ruby-changes:34559

From: nobu <ko1@a...>
Date: Wed, 2 Jul 2014 01:18:48 +0900 (JST)
Subject: [ruby-changes:34559] nobu:r46640 (trunk): test_gem_remote_fetcher.rb: stop SSL server

nobu	2014-07-02 01:18:41 +0900 (Wed, 02 Jul 2014)

  New Revision: 46640

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=46640

  Log:
    test_gem_remote_fetcher.rb: stop SSL server
    
    * test/rubygems/test_gem_remote_fetcher.rb (stop_servers): stop
      SSL server before shutdown its thread.

  Modified files:
    trunk/test/rubygems/test_gem_remote_fetcher.rb
Index: test/rubygems/test_gem_remote_fetcher.rb
===================================================================
--- test/rubygems/test_gem_remote_fetcher.rb	(revision 46639)
+++ test/rubygems/test_gem_remote_fetcher.rb	(revision 46640)
@@ -723,9 +723,13 @@ gems: https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_remote_fetcher.rb#L723
         @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: https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_remote_fetcher.rb#L780
           raise
         end
       end
-      @ssl_server = t
+      @ssl_server = server
+      @ssl_server_thread = t
       server
     end
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]