From 204659d56ddd214cf1dd74ff2d50c17d5ad7d2a1 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Wed, 3 Nov 2021 18:27:45 -0500 Subject: [PATCH] CI: integration.rb - allow for nil in wait_for_server_to_boot (#2747) --- test/helpers/integration.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/helpers/integration.rb b/test/helpers/integration.rb index b74f936742..9f4a6d29fc 100644 --- a/test/helpers/integration.rb +++ b/test/helpers/integration.rb @@ -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