Merge branch 'unicorn-test-boot-timeout' into 'master'
Increase unicorn test boot timeout to 5 minutes See merge request !12022
This commit is contained in:
commit
7bd5b8c1c7
|
@ -67,8 +67,8 @@ describe 'Unicorn' do
|
||||||
end
|
end
|
||||||
|
|
||||||
def wait_unicorn_boot!(master_pid, ready_file)
|
def wait_unicorn_boot!(master_pid, ready_file)
|
||||||
# Unicorn should boot in under 60 seconds so 120 seconds seems like a good timeout.
|
# We have seen the boot timeout after 2 minutes in CI so let's set it to 5 minutes.
|
||||||
timeout = 120
|
timeout = 5 * 60
|
||||||
timeout.times do
|
timeout.times do
|
||||||
return if File.exist?(ready_file)
|
return if File.exist?(ready_file)
|
||||||
pid = Process.waitpid(master_pid, Process::WNOHANG)
|
pid = Process.waitpid(master_pid, Process::WNOHANG)
|
||||||
|
|
Loading…
Reference in New Issue