kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

Even more JRuby skips/fixes

Browse source
This commit is contained in:
Nate Berkopec 2020-03-14 10:45:38 -06:00
parent 89be0977fc
commit a90c73948a
No known key found for this signature in database
GPG key ID: BDD7A4B8E43906A6
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/helpers/integration.rb
View file

@ -23,10 +23,13 @@ class TestIntegration < Minitest::Test
stop_server @pid, signal: :INT stop_server @pid, signal: :INT
end end
if @ios_to_close
@ios_to_close.each do |io| @ios_to_close.each do |io|
io.close if io.is_a?(IO) && !io.closed? io.close if io.is_a?(IO) && !io.closed?
io = nil io = nil
end end
end
refute File.exist?(@bind_path), "Bind path must be removed after stop" refute File.exist?(@bind_path), "Bind path must be removed after stop"
File.unlink(@bind_path) rescue nil File.unlink(@bind_path) rescue nil

2
test/test_binder.rb
View file

@ -284,7 +284,7 @@ class TestBinder < TestBinderBase
sock = Addrinfo.unix(path).listen sock = Addrinfo.unix(path).listen
assert_activates_sockets(path: path, sock: sock) assert_activates_sockets(path: path, sock: sock)
ensure ensure
File.unlink path if path File.unlink(path) rescue nil # JRuby race?
end end
private private

3
test/test_redirect_io.rb
View file

@ -14,11 +14,12 @@ class TestRedirectIO < TestIntegration
def teardown def teardown
super super
paths = [@out_file_path, @err_file_path, @old_out_file_path, @old_err_file_path] paths = [@out_file_path, @err_file_path, @old_out_file_path, @old_err_file_path].compact
File.unlink(*paths) File.unlink(*paths)
end end
def test_sighup_redirects_io_single def test_sighup_redirects_io_single
skip_on :jruby # Server isn't coming up in CI, TODO Fix
skip_unless_signal_exist? :HUP skip_unless_signal_exist? :HUP
cli_args = [ cli_args = [