Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Primary navigation
Search or go to…
Project
GitLab
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Privacy statement
Keyboard shortcuts
?
What's new
4
Snippets
Groups
Projects
Show more breadcrumbs
GitLab.org
GitLab
Commits
a406d7ca
Verified
Commit
a406d7ca
authored
2 months ago
by
Andrejs Cunskis
Browse files
Options
Downloads
Patches
Plain Diff
Improve low level network error handling in e2e readiness check
Fix spec
parent
cf645c53
No related branches found
No related tags found
3 merge requests
!181325
Fix ambiguous `created_at` in project.rb
,
!179611
Draft: Rebase CR approach for zoekt assignments
,
!177020
Improve low level network error handling in e2e readiness check
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
qa/qa/tools/readiness_check.rb
+6
-0
6 additions, 0 deletions
qa/qa/tools/readiness_check.rb
qa/spec/tools/readiness_check_spec.rb
+3
-1
3 additions, 1 deletion
qa/spec/tools/readiness_check_spec.rb
with
9 additions
and
1 deletion
qa/qa/tools/readiness_check.rb
+
6
−
0
View file @
a406d7ca
...
...
@@ -85,6 +85,8 @@ def wait_for_login_page_to_load
# @param response [RestClient::Response]
# @return [Boolean]
def
cloudflare_response?
(
response
)
return
false
unless
response
response
.
headers
[
:server
]
==
"cloudflare"
||
response
.
code
==
403
end
...
...
@@ -102,6 +104,7 @@ def validate_readiness_via_ui!
# @param response [RestClient::Response]
# @return [void]
def
validate_readiness_via_api!
(
response
)
raise
"Failed to obtain valid http response from
#{
sign_in_url
}
"
unless
response
raise
"Got unsucessfull response code from
#{
sign_in_url
}
:
#{
response
.
code
}
"
unless
ok_response?
(
response
)
raise
"Sign in page missing required elements: '
#{
elements_css
}
'"
unless
required_elements_present?
(
response
)
end
...
...
@@ -111,6 +114,9 @@ def validate_readiness_via_api!(response)
# @return [RestClient::Response]
def
fetch_sign_in_page
get
(
sign_in_url
)
rescue
StandardError
=>
e
debug
(
"Error fetching sign-in page:
#{
e
}
"
)
nil
end
# Validate response code is 200
...
...
This diff is collapsed.
Click to expand it.
qa/spec/tools/readiness_check_spec.rb
+
3
−
1
View file @
a406d7ca
...
...
@@ -64,7 +64,9 @@
end
it
"raises an error on validation"
do
expect
{
readiness_check
.
perform
}.
to
raise_error
(
"
#{
msg_base
}
Timed out connecting to server"
)
expect
{
readiness_check
.
perform
}.
to
raise_error
(
"
#{
msg_base
}
Failed to obtain valid http response from example.com/users/sign_in"
)
end
end
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment