diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-19 05:20:44 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-19 05:20:44 +0000 |
| commit | 53b89477a1b5b3cdee6dc9347ca34652947b724a (patch) | |
| tree | 29a5880e9e38f50a7ef10134773e204929261065 /test/openssl | |
| parent | e184e61a2b3216698c450259fa983be55dcca486 (diff) | |
merge from trunk (r27877, r27879, r27880, r27883, r27884)
* test/zlib/test_zlib.rb (test_adler32_combine, test_crc32_combine): skip if
they are not implemented.
* test/socket/test_addrinfo.rb: ipaddr.rb defines Socket::AF_INET6 as an Object
if the constant is not available.
* test/logger/test_logger.rb: close logger (or logdevice) if it's related to
a file because some platforms such as Windows cannot remove opened files.
* test/openssl/test_ssl.rb (server_loop): treat Errno::ENOTSOCK just like as
Errno::EBADF and Errno::EINVAL.
* test/openssl/test_ssl.rb (test_client_auth): Errno::ECONNRESET is raised on
Windows.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27885 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/openssl')
| -rw-r--r-- | test/openssl/test_ssl.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index ef442d41d0..558bf1bce4 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -80,7 +80,7 @@ class OpenSSL::TestSSL < Test::Unit::TestCase server_proc.call(ctx, ssl) end end - rescue Errno::EBADF, IOError, Errno::EINVAL, Errno::ECONNABORTED + rescue Errno::EBADF, IOError, Errno::EINVAL, Errno::ECONNABORTED, Errno::ENOTSOCK end def start_server(port0, verify_mode, start_immediately, args = {}, &block) @@ -245,7 +245,7 @@ class OpenSSL::TestSSL < Test::Unit::TestCase def test_client_auth vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT start_server(PORT, vflag, true){|server, port| - assert_raise(OpenSSL::SSL::SSLError){ + assert_raise(OpenSSL::SSL::SSLError, Errno::ECONNRESET){ sock = TCPSocket.new("127.0.0.1", port) ssl = OpenSSL::SSL::SSLSocket.new(sock) ssl.connect |