mame	2008-04-23 00:36:36 +0900 (Wed, 23 Apr 2008)

  New Revision: 16161

  Modified files:
    trunk/ChangeLog
    trunk/test/openssl/test_ssl.rb

  Log:
    * test/openssl/test_ssl.rb (start_server): add timeout to server.join.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16161&r2=16160&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/openssl/test_ssl.rb?r1=16161&r2=16160&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16160)
+++ ChangeLog	(revision 16161)
@@ -1,3 +1,7 @@
+Wed Apr 23 00:36:03 2008  Yusuke Endoh  <mame@t...>
+
+	* test/openssl/test_ssl.rb (start_server): add timeout to server.join.
+
 Wed Apr 23 00:18:45 2008  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* test/ruby/test_symbol.rb (TestSymbol#test_to_proc): Improve
Index: test/openssl/test_ssl.rb
===================================================================
--- test/openssl/test_ssl.rb	(revision 16160)
+++ test/openssl/test_ssl.rb	(revision 16161)
@@ -129,7 +129,14 @@
       block.call(server, port.to_i)
     ensure
       tcps.close if (tcps)
-      server.join if (server)
+      if (server)
+        server.join(5)
+        if server.alive?
+          server.kill
+          server.join
+          flunk("TCPServer was closed and SSLServer is still alive") unless $!
+        end
+      end
     end
   end
 

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