Skip to content

Commit

Permalink
CI: integration.rb - allow for nil in wait_for_server_to_boot (puma#2747
Browse files Browse the repository at this point in the history
)
  • Loading branch information
MSP-Greg authored and JuanitoFatas committed Sep 9, 2022
1 parent 0e69a82 commit 204659d
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions test/helpers/integration.rb
Expand Up @@ -104,18 +104,17 @@ def restart_server(connection, log: false)
end

# wait for server to say it booted
# @server and/or @server.gets may be nil on slow CI systems
def wait_for_server_to_boot(log: false)
# OSX 10.15 seems to need a little extra time, @server.gets fails
sleep 0.2 if Puma::IS_OSX
if log
puts "Waiting for server to boot..."
begin
line = @server.gets
line = @server && @server.gets
puts line if line && line.strip != ''
end until line.include? 'Ctrl-C'
end until line && line.include?('Ctrl-C')
puts "Server booted!"
else
true until @server.gets.include? 'Ctrl-C'
true until @server && (@server.gets || '').include?('Ctrl-C')
end
end

Expand Down

0 comments on commit 204659d

Please sign in to comment.