diff options
| author | Yusuke Endoh <mame@ruby-lang.org> | 2020-03-21 15:46:33 +0900 |
|---|---|---|
| committer | NARUSE, Yui <naruse@airemix.jp> | 2020-03-26 22:17:08 +0900 |
| commit | c9a7643a7e5993975e7e8c985df157d73b16a490 (patch) | |
| tree | 1b55d0f53c98e9592f5e4d4f08728016db8a7523 | |
| parent | 897d4e31b0e5b29405480ed3236bc8c5c6cac3fa (diff) | |
test/openssl/test_ssl.rb: ignore SSLError when the connection is closed
"test_close_after_socket_close" checks if ssl.close is no-op even after
the wrapped socket is closed. The test itself is fair, but the other
endpoint that is reading the SSL connection may fail with SSLError:
"SSL_read: unexpected eof while reading" in some environments:
https://github.com/ruby/ruby/actions/runs/60085389 (MinGW)
https://rubyci.org/logs/rubyci.s3.amazonaws.com/android28-x86_64/ruby-master/log/20200321T034442Z.fail.html.gz
```
1) Failure:
OpenSSL::TestSSL#test_close_after_socket_close [D:/a/ruby/ruby/src/test/openssl/utils.rb:299]:
exceptions on 1 threads:
SSL_read: unexpected eof while reading
```
This changeset rescues and ignores the SSLError in the test.
(cherry picked from commit be76e86e69106c6906322dc30aa75c3ff65da63c)
| -rw-r--r-- | test/openssl/test_ssl.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index 940bc135ed..45a9addf53 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -1270,8 +1270,13 @@ end } end + def readwrite_loop_safe(ctx, ssl) + readwrite_loop(ctx, ssl) + rescue OpenSSL::SSL::SSLError + end + def test_close_after_socket_close - start_server { |port| + start_server(server_proc: method(:readwrite_loop_safe)) { |port| sock = TCPSocket.new("127.0.0.1", port) ssl = OpenSSL::SSL::SSLSocket.new(sock) ssl.connect |