* test/openssl/test_ssl.rb (server_loop): rescue Errno::EINVAL and

  Errno::ECONNABORTED.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 43ac8e4bc1..8aad884d5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jul 27 23:32:42 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/openssl/test_ssl.rb (server_loop): rescue Errno::EINVAL and
+	  Errno::ECONNABORTED.
+
 Sun Jul 27 22:11:57 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* bootstraptests/method.rb: increase RLIMIT_STACK size to 4M+8Kbytes
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 876ca4c685..eadff733a6 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -86,7 +86,7 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
         server_proc.call(ctx, ssl)
       end
     end
-  rescue Errno::EBADF, IOError
+  rescue Errno::EBADF, IOError, Errno::EINVAL, Errno::ECONNABORTED
   end
 
   def start_server(port0, verify_mode, start_immediately, args = {}, &block)
@@ -128,8 +128,8 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
 
       block.call(server, port.to_i)
     ensure
-      tcps.shutdown if (tcps)
       begin
+        tcps.shutdown if (tcps)
         if (server)
           server.join(5)
           if server.alive?
@@ -138,7 +138,6 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
             flunk("TCPServer was closed and SSLServer is still alive") unless $!
           end
         end
-      rescue Errno::EINVAL, Errno::EBADF
       ensure
         tcps.close if (tcps)
       end