Unskip two jruby ssl tests that were hanging [changelog skip] #2293
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
1. Fix the conversion of a nil verify_mode to integer (was throwing 'no implicit conversion of nil into Integer') 2. Use the correct keystore password. 3. Use cipher suites that are supported in Java 8.
|
Wunderbar! Thank you so much! |
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.
Description
This fixes two JRuby tests that were skipped. It therefore fixes part of issue #2183.
The only production code change is to handle a nil
verify_modeproperly inMiniSSL.java. The previous code was throwing an exception 'no implicit conversion of nil into Integer'. Now a nilverify_modewill be converted to 0 and behave the same as if 'none' is specified.The other changes are in the test setup. The keystore password was incorrect and the cipher suites specified are not ones that appear in the list returned by calling
getSupportedCipherSuites()on the SSLEngine.New error messages are spat out during the running of these tests, but that's an existing problem.
Puma::MiniSSL::Socketis calling methods that are only defined by the C engine, such asinit?andshutdown.Your checklist for this pull request
[changelog skip]the pull request title.[ci skip]to the title of the PR.#issue" to the PR description or my commit messages.