Cleanups in SSL tests #853
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The keyword argument is no longer used by any test cases.
Use start_server instead of start_server_version. start_server_version is a wrapper around start_server that forces the server to a specific protocol version using the now-deprecated method SSLSocket#ssl_version=, but it does more than that. The slightly different method signature and default values are confusing. Let's use start_server directly.
The list of NPN protocols is validated in SSLContext#setup. The assert_handshake_error is misleading. The client is unable to start a handshake at all because the server is not running.
Minimize the amount of code inside the assert_raise block to avoid accidentally catching a wrong exception.
assert_handshake_error is useful for checking handshake failures triggered by the peer, as the underlying socket may be closed prematurely, leading to different exceptions depending on the platform and timing. However, when the local end aborts a handshake, the only possible exception is OpenSSL::SSL::SSLError. Use stricter assertions in such cases.
Avoid using the deprecated OpenSSL::SSL::SSLContext#ssl_version= outside the tests specifically written for it.
This reverts commit 8c96a69. This is no longer necessary since we do not support OpenSSL 1.1.0 anymore.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains several mostly-unrelated small improvements in the test code for
OpenSSL::SSL.ssl: remove start_immediately kwarg from test helper start_server
The keyword argument is no longer used by any test cases.
ssl: remove start_server_version from tests
Use start_server instead of start_server_version.
start_server_version is a wrapper around start_server that forces the
server to a specific protocol version using the now-deprecated method
SSLSocket#ssl_version=, but it does more than that. The slightly
different method signature and default values are confusing. Let's
use start_server directly.
ssl: fix test case test_npn_advertised_protocol_too_long
The list of NPN protocols is validated in SSLContext#setup.
The assert_handshake_error is misleading. The client is unable to start
a handshake at all because the server is not running.
ssl: refactor test case test_verify_mode_server_cert
Minimize the amount of code inside the assert_raise block to avoid
accidentally catching a wrong exception.
ssl: fix misuse of assert_handshake_error in tests
assert_handshake_error is useful for checking handshake failures
triggered by the peer, as the underlying socket may be closed
prematurely, leading to different exceptions depending on the platform
and timing.
However, when the local end aborts a handshake, the only possible
exception is OpenSSL::SSL::SSLError. Use stricter assertions in such
cases.
ssl: prefer SSLContext#max_version= in tests
Avoid using the deprecated OpenSSL::SSL::SSLContext#ssl_version= outside
the tests specifically written for it.
Revert "Skip a new test when old OpenSSL"
This reverts commit 8c96a69.
This is no longer necessary since we do not support OpenSSL 1.1.0
anymore.