diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-08 17:39:23 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-08 17:39:23 +0000 |
| commit | 7bd5b8c1c709163547ec865484b341211158ebf1 (patch) | |
| tree | 133152921787c686f4ff9821383365c7a4019f3a | |
| parent | 6cbe38675dcd0547d9127373851471008e624e2b (diff) | |
| parent | ef3adb65797a5479ea9c7cbbdf6039c3ea21641c (diff) | |
| download | gitlab-ce-7bd5b8c1c709163547ec865484b341211158ebf1.tar.gz | |
Merge branch 'unicorn-test-boot-timeout' into 'master'
Increase unicorn test boot timeout to 5 minutes
See merge request !12022
| -rw-r--r-- | spec/unicorn/unicorn_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/unicorn/unicorn_spec.rb b/spec/unicorn/unicorn_spec.rb index 8518c047a47..41de94d35c2 100644 --- a/spec/unicorn/unicorn_spec.rb +++ b/spec/unicorn/unicorn_spec.rb @@ -67,8 +67,8 @@ describe 'Unicorn' do end def wait_unicorn_boot!(master_pid, ready_file) - # Unicorn should boot in under 60 seconds so 120 seconds seems like a good timeout. - timeout = 120 + # We have seen the boot timeout after 2 minutes in CI so let's set it to 5 minutes. + timeout = 5 * 60 timeout.times do return if File.exist?(ready_file) pid = Process.waitpid(master_pid, Process::WNOHANG) |