Skip to content

Stop the open-uri test server racing its own socket close #9718

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.

Sign up for GitHub

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

Open
aminmansuri wants to merge 1 commit into
base: jruby-10.0
Choose a base branch
from
+8 −1
Open

Stop the open-uri test server racing its own socket close #9718

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion test/mri/open-uri/utils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,15 @@ def start
end
end

# NOTE: patched by JRuby
# NOTE: patched by JRuby: CRuby kills the thread before closing the socket, and
# JRuby had that commented out, so the close landed under a blocked accept. The
# thread's own failure still reaches the test through the harness's join.
def shutdown
@thread.kill
begin
@thread.join
rescue Exception
end
@server.close
end

Expand Down
Loading