diff options
Diffstat (limited to 'test/openssl')
-rw-r--r-- | test/openssl/test_pair.rb | 4 | ||||
-rw-r--r-- | test/openssl/test_ssl.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb index 9d22a87e29..e5beebc502 100644 --- a/test/openssl/test_pair.rb +++ b/test/openssl/test_pair.rb @@ -147,14 +147,14 @@ class OpenSSL::TestPair < Test::Unit::TestCase def test_read_nonblock ssl_pair {|s1, s2| err = nil - assert_raise(Errno::EWOULDBLOCK) { + assert_raise(OpenSSL::SSL::SSLError) { begin s2.read_nonblock(10) ensure err = $! end } - assert_match(/SSL_ERROR_WANT_READ/, err.message) + assert_kind_of(IO::WaitReadable, err) s1.write "abc\ndef\n" IO.select([s2]) assert_equal("ab", s2.read_nonblock(2)) diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index 5053634a84..4688552cd3 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -172,12 +172,12 @@ class OpenSSL::TestSSL < Test::Unit::TestCase ssl = OpenSSL::SSL::SSLSocket.new(sock) ssl.sync_close = true ssl.connect - assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) { ssl.read_nonblock(100) } + assert_raise(IO::WaitReadable) { ssl.read_nonblock(100) } ssl.write("abc\n") IO.select [ssl] assert_equal('a', ssl.read_nonblock(1)) assert_equal("bc\n", ssl.read_nonblock(100)) - assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) { ssl.read_nonblock(100) } + assert_raise(IO::WaitReadable) { ssl.read_nonblock(100) } } end |