Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
ef3adb65
Commit
ef3adb65
authored
Jun 08, 2017
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Increase unicorn test boot timeout to 5 minutes
parent
e9002222
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
spec/unicorn/unicorn_spec.rb
spec/unicorn/unicorn_spec.rb
+2
-2
No files found.
spec/unicorn/unicorn_spec.rb
View file @
ef3adb65
...
@@ -67,8 +67,8 @@ describe 'Unicorn' do
...
@@ -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
=
12
0
timeout
=
5
*
6
0
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment