CI: test_plugin_systemd.rb - fixups for intermittent retries #3594
+16
−19
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
dentarg
reviewed
Jan 10, 2025
| @@ -137,10 +137,7 @@ def self.notify(state, unset_env=false) | |||
| ENV.delete("NOTIFY_SOCKET") if unset_env | |||
|
|
|||
| begin | |||
| Addrinfo.unix(sock, :DGRAM).connect do |s| | |||
| s.close_on_exec = true | |||
There was a problem hiding this comment.
I assume we remove this line because (from https://docs.ruby-lang.org/en/3.3/IO.html#method-i-close_on_exec-3D)
Ruby sets close-on-exec flags of all file descriptors by default since Ruby 2.0.0. So you don’t need to set by yourself.
dentarg
reviewed
Jan 10, 2025
test/test_plugin_systemd.rb
Outdated
| @socket = Socket.new(:UNIX, :DGRAM, 0) | ||
| socket_ai = Addrinfo.unix(@sockaddr) | ||
| @socket.bind Addrinfo.unix(@sockaddr) | ||
| @env = {"NOTIFY_SOCKET" => @sockaddr } |
There was a problem hiding this comment.
Suggested change
| @env = {"NOTIFY_SOCKET" => @sockaddr } | |
| @env = { "NOTIFY_SOCKET" => @sockaddr } |
There was a problem hiding this comment.
As you suggested, and rebased.
Interesting, much of Ruby's docs have no spaces with hashes, but much of the Rails docs use spaces...
dentarg
approved these changes
Jan 10, 2025
github-actions
bot
added
waiting-for-merge
and removed
waiting-for-review
MSP-Greg
force-pushed
the
00-test_plugin_systemd.rb
branch
from
81c92cc to
872f84b
Compare
joshuay03
pushed a commit
to joshuay03/puma
that referenced
this pull request
Jan 12, 2025
* CI: test_plugin_systemd.rb - update systemd NOTIFY_SOCKET creation * CI: test_plugin_systemd.rb - refactor assert_message * sd_notify.rb - small refactor, update for new Rubies
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
The tests in this file fail and/or retry intermittently. The changes involve code that parses the notify socket. On GHA CI, there are status messages interlaced with other messages. These are due to delays common on GHA, but not reproducible locally.
It seems to help...
Your checklist for this pull request
[ci skip]to the title of the PR.#issue" to the PR description or my commit messages.