Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TestPumaServerSSLClient - share Context [changelog skip] #2364

Merged
merged 1 commit into from Sep 14, 2020

Conversation

MSP-Greg
Copy link
Member

@MSP-Greg MSP-Greg commented Sep 13, 2020

Description

While working in my fork, JRuby would intermittently have failures/timeouts from the tests in TestPumaServerSSLClient.

These tests can share the SSL Context, so adjust code to create a shared one. Note that the tests in TestPumaServerSSL yield the Context, so sharing them won't work.

Note that CI passed in my fork:
https://github.com/MSP-Greg/puma/runs/1109220969

Your checklist for this pull request

  • I have reviewed the guidelines for contributing to this repository.
  • I have added an entry to History.md if this PR fixes a bug or adds a feature. If it doesn't need an entry to HISTORY.md, I have added [changelog skip] or [ci skip] to the pull request title.
  • I have added appropriate tests if this PR fixes a bug or adds a feature.
  • My pull request is 100 lines added/removed or less so that it can be easily reviewed.
  • If this PR doesn't need tests (docs change), I added [ci skip] to the title of the PR.
  • If this closes any issues, I have added "Closes #issue" to the PR description or my commit messages.
  • I have updated the documentation accordingly.
  • All new and existing tests passed, including Rubocop.

@nateberkopec nateberkopec merged commit 5b56986 into puma:master Sep 14, 2020
@MSP-Greg MSP-Greg deleted the share-cert branch September 14, 2020 21:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants