Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-06-08 19:35:55 +0300
committerJacob Vosmaer <jacob@gitlab.com>2017-06-08 19:35:55 +0300
commitef3adb65797a5479ea9c7cbbdf6039c3ea21641c (patch)
tree7a377fec3096958d8e29389dc8db8a693396eee7
parente9002222a0fc65e4e3328c7c536e43516986eb40 (diff)
Increase unicorn test boot timeout to 5 minutes
-rw-r--r--spec/unicorn/unicorn_spec.rb4
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)