mame	2008-06-30 23:15:48 +0900 (Mon, 30 Jun 2008)

  New Revision: 17747

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

  Log:
    * test/openssl/test_ssl.rb (start_server): shutdown TCPServer before
      close.



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

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17746)
+++ ChangeLog	(revision 17747)
@@ -1,3 +1,8 @@
+Mon Jun 30 23:15:07 2008  Yusuke Endoh  <mame@t...>
+
+	* test/openssl/test_ssl.rb (start_server): shutdown TCPServer before
+	  close.
+
 Mon Jun 30 23:01:50 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (RUBY_H_INCLUDES): common headers which are included with
Index: test/openssl/test_ssl.rb
===================================================================
--- test/openssl/test_ssl.rb	(revision 17746)
+++ test/openssl/test_ssl.rb	(revision 17747)
@@ -128,14 +128,19 @@
 
       block.call(server, port.to_i)
     ensure
-      tcps.close if (tcps)
-      if (server)
-        server.join(5)
-        if server.alive?
-          server.kill
-          server.join
-          flunk("TCPServer was closed and SSLServer is still alive") unless $!
+      tcps.shutdown if (tcps)
+      begin
+        if (server)
+          server.join(5)
+          if server.alive?
+            server.kill
+            server.join
+            flunk("TCPServer was closed and SSLServer is still alive") unless $!
+          end
         end
+      rescue Errno::EINVAL, Errno::EBADF
+      ensure
+        tcps.close if (tcps)
       end
     end
   end

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