Improve worker shutdown reliability, CI fixes #2312
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
helper.rb Previous code used #capture_exceptions to add a timeout to every test. That method is called once for set methods and the test method, and once for the teardown methods. New code uses #time_it, which wraps all the methods in one timeout thread. test_integration.rb Add another error to UnixSocket tests.
|
LGTM, the additional rescues are fairly conservative IMO. |
dentarg
reviewed
Jul 20, 2020
| t0 = Minitest.clock_time | ||
| ::Timeout.timeout(RUBY_ENGINE == 'ruby' ? 60 : 120, TestTookTooLong) { yield } | ||
| ensure | ||
| self.time = Minitest.clock_time - t0 |
There was a problem hiding this comment.
TIL :-) 👍
minitest source code links for anyone else curious:
8 tasks
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
CI is unreliable, with random failures across all Ruby types. Small changes to lib files for shutdown, minor test changes.
Note that incomplete JRuby SSL implementation (
Puma::MiniSSL::Engine#init?&#shutdown) will still intermittently cause CI failure.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.