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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
2fa30478
Commit
2fa30478
authored
Oct 10, 2019
by
Ash McKenzie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use higher level status to determine readiness
parent
730ace4f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
6 deletions
+11
-6
qa/qa/ee/scenario/test/geo.rb
qa/qa/ee/scenario/test/geo.rb
+11
-6
No files found.
qa/qa/ee/scenario/test/geo.rb
View file @
2fa30478
...
...
@@ -138,12 +138,10 @@ module QA
Time
.
new
.
tap
do
|
start
|
while
Time
.
new
-
start
<
120
begin
Net
::
HTTP
.
get
(
URI
.
join
(
@address
,
'/-/readiness'
)).
tap
do
|
body
|
if
JSON
.
parse
(
body
).
all?
{
|
_
,
service
|
service
[
'status'
]
==
'ok'
}
return
puts
"
\n
Secondary ready after
#{
Time
.
now
-
start
}
seconds."
# rubocop:disable Cop/AvoidReturnFromBlocks
else
print
'.'
end
if
host_ready?
return
puts
"
\n
Secondary ready after
#{
Time
.
now
-
start
}
seconds."
# rubocop:disable Cop/AvoidReturnFromBlocks
else
print
'.'
end
rescue
StandardError
print
'e'
...
...
@@ -168,6 +166,13 @@ module QA
QA
::
Page
::
Main
::
Menu
.
perform
(
&
:sign_out
)
end
end
private
def
host_ready?
body
=
Net
::
HTTP
.
get
(
URI
.
join
(
@address
,
'/-/readiness'
))
JSON
.
parse
(
body
)[
'status'
]
==
'ok'
end
end
end
end
...
...
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