diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-30 14:15:48 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-30 14:15:48 +0000 |
| commit | 3d90ec1819b693a30d20a12866ae5a438a1bba0b (patch) | |
| tree | 5b0b763f23c89cb8a74dca9e400638eb20170467 | |
| parent | 9e4c87a6b0e169a26f51d1100108d7093baaec47 (diff) | |
| download | ruby-3d90ec1819b693a30d20a12866ae5a438a1bba0b.tar.gz ruby-3d90ec1819b693a30d20a12866ae5a438a1bba0b.tar.xz ruby-3d90ec1819b693a30d20a12866ae5a438a1bba0b.zip | |
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/openssl/test_ssl.rb | 19 |
2 files changed, 17 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Mon Jun 30 23:15:07 2008 Yusuke Endoh <mame@tsg.ne.jp> + + * test/openssl/test_ssl.rb (start_server): shutdown TCPServer before + close. + Mon Jun 30 23:01:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * common.mk (RUBY_H_INCLUDES): common headers which are included with 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 |