diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | test/openssl/test_pair.rb | 18 |
2 files changed, 20 insertions, 6 deletions
@@ -1,3 +1,11 @@ +Tue Sep 3 10:03:42 2013 NAKAMURA Usaku <usa@ruby-lang.org> + + * test/openssl/test_pair.rb + (OpenSSL::TestPair#test_write_nonblock_no_exceptions): on some CIs + such as Debian 6.0, Ubuntu 10.04, CentOS and vc10-x64 (maybe depend + on OpenSSL version), writing to SSLSocket after SSL_ERROR_WANT_WRITE + causes SSL_ERROR_SSL "bad write retry". + Tue Sep 3 08:20:46 2013 NARUSE, Yui <naruse@ruby-lang.org> * enc/trans/utf8_mac-tbl.rb: update conversion table to recent OS X. diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb index e6b495f669..0087ef3078 100644 --- a/test/openssl/test_pair.rb +++ b/test/openssl/test_pair.rb @@ -206,12 +206,18 @@ class OpenSSL::TestPair < Test::Unit::TestCase def test_write_nonblock_no_exceptions ssl_pair {|s1, s2| n = 0 - n += write_nonblock_no_ex s1, "a" * 100000 - n += write_nonblock_no_ex s1, "b" * 100000 - n += write_nonblock_no_ex s1, "c" * 100000 - n += write_nonblock_no_ex s1, "d" * 100000 - n += write_nonblock_no_ex s1, "e" * 100000 - n += write_nonblock_no_ex s1, "f" * 100000 + begin + n += write_nonblock_no_ex s1, "a" * 100000 + n += write_nonblock_no_ex s1, "b" * 100000 + n += write_nonblock_no_ex s1, "c" * 100000 + n += write_nonblock_no_ex s1, "d" * 100000 + n += write_nonblock_no_ex s1, "e" * 100000 + n += write_nonblock_no_ex s1, "f" * 100000 + rescue OpenSSL::SSL::SSLError => e + # on some platforms (maybe depend on OpenSSL version), writing to + # SSLSocket after SSL_ERROR_WANT_WRITE causes this error. + raise e if n == 0 + end s1.close assert_equal(n, s2.read.length) } |