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

  close.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17747 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 12 insertions, 7 deletions

diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 50659f1b3..876ca4c68 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -128,14 +128,19 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
 
       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