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
9e14f736
Commit
9e14f736
authored
Sep 23, 2021
by
Nick Westbury
Committed by
Ramya Authappan
Sep 23, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Geo tests to only assert controllable output text
parent
8ef76585
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
20 deletions
+4
-20
qa/qa/specs/features/ee/browser_ui/geo/http_push_to_secondary_spec.rb
...features/ee/browser_ui/geo/http_push_to_secondary_spec.rb
+4
-19
qa/qa/specs/features/ee/browser_ui/geo/ssh_push_to_secondary_spec.rb
.../features/ee/browser_ui/geo/ssh_push_to_secondary_spec.rb
+0
-1
No files found.
qa/qa/specs/features/ee/browser_ui/geo/http_push_to_secondary_spec.rb
View file @
9e14f736
...
@@ -63,18 +63,11 @@ module QA
...
@@ -63,18 +63,11 @@ module QA
end
end
# We need to strip off the user from the URI, otherwise we won't
# We need to strip off the user from the URI, otherwise we won't
# get the correct output
produced from the git CLI.
# get the correct output
primary_uri
=
project
.
repository_http_location
.
uri
primary_uri
=
project
.
repository_http_location
.
uri
primary_uri
.
user
=
nil
primary_uri
.
user
=
nil
# The secondary inserts a special path prefix.
expect
(
push
.
output
).
to
match
(
%r{This request to a Geo secondary node will be forwarded to the.*Geo primary node:.*
#{
primary_uri
}
}m
)
# See `Gitlab::Geo::GitPushHttp::PATH_PREFIX`.
path
=
File
.
join
(
git_push_http_path_prefix
,
'\d+'
,
primary_uri
.
path
)
absolute_path
=
primary_uri
.
to_s
.
sub
(
primary_uri
.
path
,
path
)
# The git cli produces the 'warning: redirecting to..' output
# internally.
expect
(
push
.
output
).
to
match
(
/warning: redirecting to
#{
absolute_path
}
/
)
# Validate git push worked and new content is visible
# Validate git push worked and new content is visible
Page
::
Project
::
Show
.
perform
do
|
show
|
Page
::
Project
::
Show
.
perform
do
|
show
|
...
@@ -145,19 +138,11 @@ module QA
...
@@ -145,19 +138,11 @@ module QA
end
end
# We need to strip off the user from the URI, otherwise we won't
# We need to strip off the user from the URI, otherwise we won't
# get the correct output
produced from the git CLI.
# get the correct output
primary_uri
=
project
.
repository_http_location
.
uri
primary_uri
=
project
.
repository_http_location
.
uri
primary_uri
.
user
=
nil
primary_uri
.
user
=
nil
# The secondary inserts a special path prefix.
expect
(
push
.
output
).
to
match
(
%r{This request to a Geo secondary node will be forwarded to the.*Geo primary node:.*
#{
primary_uri
}
}m
)
# See `Gitlab::Geo::GitPushHttp::PATH_PREFIX`.
path
=
File
.
join
(
git_push_http_path_prefix
,
'\d+'
,
primary_uri
.
path
)
absolute_path
=
primary_uri
.
to_s
.
sub
(
primary_uri
.
path
,
path
)
# The git cli produces the 'warning: redirecting to..' output
# internally.
expect
(
push
.
output
).
to
match
(
/warning: redirecting to
#{
absolute_path
}
/
)
expect
(
push
.
output
).
to
match
(
/Locking support detected on remote "
#{
location
.
uri
}
"/
)
# Validate git push worked and new content is visible
# Validate git push worked and new content is visible
Page
::
Project
::
Show
.
perform
do
|
show
|
Page
::
Project
::
Show
.
perform
do
|
show
|
...
...
qa/qa/specs/features/ee/browser_ui/geo/ssh_push_to_secondary_spec.rb
View file @
9e14f736
...
@@ -164,7 +164,6 @@ module QA
...
@@ -164,7 +164,6 @@ module QA
ssh_uri
=
project
.
repository_ssh_location
.
git_uri
.
to_s
.
gsub
(
%r{ssh://}
,
''
)
ssh_uri
=
project
.
repository_ssh_location
.
git_uri
.
to_s
.
gsub
(
%r{ssh://}
,
''
)
expect
(
push
.
output
).
to
match
(
%r{This request to a Geo secondary node will be forwarded to the.*Geo primary node:.*
#{
ssh_uri
}
}m
)
expect
(
push
.
output
).
to
match
(
%r{This request to a Geo secondary node will be forwarded to the.*Geo primary node:.*
#{
ssh_uri
}
}m
)
expect
(
push
.
output
).
to
match
(
/Locking support detected on remote "
#{
location
.
uri
}
"/
)
# Validate git push worked and new content is visible
# Validate git push worked and new content is visible
Page
::
Project
::
Show
.
perform
do
|
show
|
Page
::
Project
::
Show
.
perform
do
|
show
|
...
...
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