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
56dffeb6
Commit
56dffeb6
authored
Feb 06, 2020
by
Jennifer Louie
Committed by
Mark Lapierre
Feb 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add debug logs to Geo E2E specs
parent
5c2c6c72
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
36 additions
and
8 deletions
+36
-8
qa/qa/ee/page/dashboard/projects.rb
qa/qa/ee/page/dashboard/projects.rb
+1
-0
qa/qa/ee/page/project/show.rb
qa/qa/ee/page/project/show.rb
+2
-0
qa/qa/ee/page/project/wiki/show.rb
qa/qa/ee/page/project/wiki/show.rb
+2
-0
qa/qa/specs/features/ee/browser_ui/geo/attachment_replication_spec.rb
...features/ee/browser_ui/geo/attachment_replication_spec.rb
+2
-0
qa/qa/specs/features/ee/browser_ui/geo/database_delete_replication_spec.rb
...res/ee/browser_ui/geo/database_delete_replication_spec.rb
+2
-0
qa/qa/specs/features/ee/browser_ui/geo/http_push_spec.rb
qa/qa/specs/features/ee/browser_ui/geo/http_push_spec.rb
+5
-8
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
-0
qa/qa/specs/features/ee/browser_ui/geo/rename_replication_spec.rb
...ecs/features/ee/browser_ui/geo/rename_replication_spec.rb
+2
-0
qa/qa/specs/features/ee/browser_ui/geo/ssh_push_spec.rb
qa/qa/specs/features/ee/browser_ui/geo/ssh_push_spec.rb
+4
-0
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
+4
-0
qa/qa/specs/features/ee/browser_ui/geo/wiki_http_push_spec.rb
...a/specs/features/ee/browser_ui/geo/wiki_http_push_spec.rb
+2
-0
qa/qa/specs/features/ee/browser_ui/geo/wiki_http_push_to_secondary_spec.rb
...res/ee/browser_ui/geo/wiki_http_push_to_secondary_spec.rb
+2
-0
qa/qa/specs/features/ee/browser_ui/geo/wiki_ssh_push_spec.rb
qa/qa/specs/features/ee/browser_ui/geo/wiki_ssh_push_spec.rb
+2
-0
qa/qa/specs/features/ee/browser_ui/geo/wiki_ssh_push_to_secondary_spec.rb
...ures/ee/browser_ui/geo/wiki_ssh_push_to_secondary_spec.rb
+2
-0
No files found.
qa/qa/ee/page/dashboard/projects.rb
View file @
56dffeb6
...
@@ -14,6 +14,7 @@ module QA
...
@@ -14,6 +14,7 @@ module QA
end
end
def
wait_for_project_replication
(
project_name
)
def
wait_for_project_replication
(
project_name
)
QA
::
Runtime
::
Logger
.
debug
(
%Q[
#{
self
.
class
.
name
}
- wait_for_project_replication]
)
wait_until
(
max_duration:
Runtime
::
Geo
.
max_db_replication_time
)
do
wait_until
(
max_duration:
Runtime
::
Geo
.
max_db_replication_time
)
do
filter_by_name
(
project_name
)
filter_by_name
(
project_name
)
...
...
qa/qa/ee/page/project/show.rb
View file @
56dffeb6
...
@@ -6,12 +6,14 @@ module QA
...
@@ -6,12 +6,14 @@ module QA
module
Project
module
Project
module
Show
module
Show
def
wait_for_repository_replication
(
max_wait:
Runtime
::
Geo
.
max_file_replication_time
)
def
wait_for_repository_replication
(
max_wait:
Runtime
::
Geo
.
max_file_replication_time
)
QA
::
Runtime
::
Logger
.
debug
(
%Q[
#{
self
.
class
.
name
}
- wait_for_repository_replication]
)
wait_until_geo_max_replication_time
(
max_wait:
max_wait
)
do
wait_until_geo_max_replication_time
(
max_wait:
max_wait
)
do
has_no_text?
(
/No repository|The repository for this project is empty/
)
has_no_text?
(
/No repository|The repository for this project is empty/
)
end
end
end
end
def
wait_for_repository_replication_with
(
text
,
max_wait:
Runtime
::
Geo
.
max_file_replication_time
)
def
wait_for_repository_replication_with
(
text
,
max_wait:
Runtime
::
Geo
.
max_file_replication_time
)
QA
::
Runtime
::
Logger
.
debug
(
%Q[
#{
self
.
class
.
name
}
- wait_for_repository_replication_with_text "
#{
text
}
"]
)
wait_until_geo_max_replication_time
(
max_wait:
max_wait
)
do
wait_until_geo_max_replication_time
(
max_wait:
max_wait
)
do
page
.
has_text?
(
text
)
page
.
has_text?
(
text
)
end
end
...
...
qa/qa/ee/page/project/wiki/show.rb
View file @
56dffeb6
...
@@ -7,12 +7,14 @@ module QA
...
@@ -7,12 +7,14 @@ module QA
module
Wiki
module
Wiki
module
Show
module
Show
def
wait_for_repository_replication
(
max_wait:
Runtime
::
Geo
.
max_file_replication_time
)
def
wait_for_repository_replication
(
max_wait:
Runtime
::
Geo
.
max_file_replication_time
)
QA
::
Runtime
::
Logger
.
debug
(
%Q[
#{
self
.
class
.
name
}
- wait_for_repository_replication]
)
wait_until_geo_max_replication_time
(
max_wait:
max_wait
)
do
wait_until_geo_max_replication_time
(
max_wait:
max_wait
)
do
has_no_text?
(
/No repository|The wiki for this project is empty/
)
has_no_text?
(
/No repository|The wiki for this project is empty/
)
end
end
end
end
def
wait_for_repository_replication_with
(
text
,
max_wait:
Runtime
::
Geo
.
max_file_replication_time
)
def
wait_for_repository_replication_with
(
text
,
max_wait:
Runtime
::
Geo
.
max_file_replication_time
)
QA
::
Runtime
::
Logger
.
debug
(
%Q[
#{
self
.
class
.
name
}
- wait_for_repository_replication_with_text "
#{
text
}
"]
)
wait_until_geo_max_replication_time
(
max_wait:
max_wait
)
do
wait_until_geo_max_replication_time
(
max_wait:
max_wait
)
do
page
.
has_text?
(
text
)
page
.
has_text?
(
text
)
end
end
...
...
qa/qa/specs/features/ee/browser_ui/geo/attachment_replication_spec.rb
View file @
56dffeb6
...
@@ -24,6 +24,8 @@ module QA
...
@@ -24,6 +24,8 @@ module QA
end
end
end
end
QA
::
Runtime
::
Logger
.
debug
(
'Visiting the secondary geo node'
)
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
expect
(
banner
).
to
have_secondary_read_only_banner
expect
(
banner
).
to
have_secondary_read_only_banner
...
...
qa/qa/specs/features/ee/browser_ui/geo/database_delete_replication_spec.rb
View file @
56dffeb6
...
@@ -24,6 +24,8 @@ module QA
...
@@ -24,6 +24,8 @@ module QA
end
end
it
'replicates deletion of a project to secondary node'
do
it
'replicates deletion of a project to secondary node'
do
QA
::
Runtime
::
Logger
.
debug
(
'Visiting the secondary geo node'
)
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
expect
(
banner
).
to
have_secondary_read_only_banner
expect
(
banner
).
to
have_secondary_read_only_banner
...
...
qa/qa/specs/features/ee/browser_ui/geo/http_push_spec.rb
View file @
56dffeb6
...
@@ -34,6 +34,8 @@ module QA
...
@@ -34,6 +34,8 @@ module QA
end
end
end
end
QA
::
Runtime
::
Logger
.
debug
(
'Visiting the secondary geo node'
)
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
expect
(
banner
).
to
have_secondary_read_only_banner
expect
(
banner
).
to
have_secondary_read_only_banner
...
@@ -63,11 +65,7 @@ module QA
...
@@ -63,11 +65,7 @@ module QA
lfs_file_display_message
=
'The rendered file could not be displayed because it is stored in LFS.'
lfs_file_display_message
=
'The rendered file could not be displayed because it is stored in LFS.'
project
=
nil
project
=
nil
Runtime
::
Browser
.
visit
(
:geo_primary
,
QA
::
Page
::
Main
::
Login
)
do
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_primary
)
do
# Visit the primary node and login
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
# Create a new Project
project
=
Resource
::
Project
.
fabricate!
do
|
project
|
project
=
Resource
::
Project
.
fabricate!
do
|
project
|
project
.
name
=
'geo-project'
project
.
name
=
'geo-project'
project
.
description
=
'Geo test project'
project
.
description
=
'Geo test project'
...
@@ -94,10 +92,9 @@ module QA
...
@@ -94,10 +92,9 @@ module QA
end
end
end
end
Runtime
::
Browser
.
visit
(
:geo_secondary
,
QA
::
Page
::
Main
::
Login
)
do
QA
::
Runtime
::
Logger
.
debug
(
'Visiting the secondary geo node'
)
# Visit the secondary node and login
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
expect
(
banner
).
to
have_secondary_read_only_banner
expect
(
banner
).
to
have_secondary_read_only_banner
end
end
...
...
qa/qa/specs/features/ee/browser_ui/geo/http_push_to_secondary_spec.rb
View file @
56dffeb6
...
@@ -33,6 +33,8 @@ module QA
...
@@ -33,6 +33,8 @@ module QA
project
.
visit!
project
.
visit!
end
end
QA
::
Runtime
::
Logger
.
debug
(
'Visiting the secondary geo node'
)
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
expect
(
banner
).
to
have_secondary_read_only_banner
expect
(
banner
).
to
have_secondary_read_only_banner
...
@@ -112,6 +114,8 @@ module QA
...
@@ -112,6 +114,8 @@ module QA
end
end
end
end
QA
::
Runtime
::
Logger
.
debug
(
'Visiting the secondary geo node'
)
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
expect
(
banner
).
to
have_secondary_read_only_banner
expect
(
banner
).
to
have_secondary_read_only_banner
...
...
qa/qa/specs/features/ee/browser_ui/geo/rename_replication_spec.rb
View file @
56dffeb6
...
@@ -42,6 +42,8 @@ module QA
...
@@ -42,6 +42,8 @@ module QA
end
end
# check renamed project exist on secondary node
# check renamed project exist on secondary node
QA
::
Runtime
::
Logger
.
debug
(
'Visiting the secondary geo node'
)
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
expect
(
banner
).
to
have_secondary_read_only_banner
expect
(
banner
).
to
have_secondary_read_only_banner
...
...
qa/qa/specs/features/ee/browser_ui/geo/ssh_push_spec.rb
View file @
56dffeb6
...
@@ -42,6 +42,8 @@ module QA
...
@@ -42,6 +42,8 @@ module QA
end
end
end
end
QA
::
Runtime
::
Logger
.
debug
(
'Visiting the secondary geo node'
)
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
expect
(
banner
).
to
have_secondary_read_only_banner
expect
(
banner
).
to
have_secondary_read_only_banner
...
@@ -113,6 +115,8 @@ module QA
...
@@ -113,6 +115,8 @@ module QA
end
end
end
end
QA
::
Runtime
::
Logger
.
debug
(
'Visiting the secondary geo node'
)
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
expect
(
banner
).
to
have_secondary_read_only_banner
expect
(
banner
).
to
have_secondary_read_only_banner
...
...
qa/qa/specs/features/ee/browser_ui/geo/ssh_push_to_secondary_spec.rb
View file @
56dffeb6
...
@@ -39,6 +39,8 @@ module QA
...
@@ -39,6 +39,8 @@ module QA
project
.
visit!
project
.
visit!
end
end
QA
::
Runtime
::
Logger
.
debug
(
'Visiting the secondary geo node'
)
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
expect
(
banner
).
to
have_secondary_read_only_banner
expect
(
banner
).
to
have_secondary_read_only_banner
...
@@ -127,6 +129,8 @@ module QA
...
@@ -127,6 +129,8 @@ module QA
end
end
end
end
QA
::
Runtime
::
Logger
.
debug
(
'Visiting the secondary geo node'
)
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
expect
(
banner
).
to
have_secondary_read_only_banner
expect
(
banner
).
to
have_secondary_read_only_banner
...
...
qa/qa/specs/features/ee/browser_ui/geo/wiki_http_push_spec.rb
View file @
56dffeb6
...
@@ -38,6 +38,8 @@ module QA
...
@@ -38,6 +38,8 @@ module QA
end
end
# Validate that wiki is synced on secondary node
# Validate that wiki is synced on secondary node
QA
::
Runtime
::
Logger
.
debug
(
'Visiting the secondary geo node'
)
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
expect
(
banner
).
to
have_secondary_read_only_banner
expect
(
banner
).
to
have_secondary_read_only_banner
...
...
qa/qa/specs/features/ee/browser_ui/geo/wiki_http_push_to_secondary_spec.rb
View file @
56dffeb6
...
@@ -42,6 +42,8 @@ module QA
...
@@ -42,6 +42,8 @@ module QA
end
end
it
'is redirected to the primary and ultimately replicated to the secondary'
do
it
'is redirected to the primary and ultimately replicated to the secondary'
do
QA
::
Runtime
::
Logger
.
debug
(
'Visiting the secondary geo node'
)
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
expect
(
banner
).
to
have_secondary_read_only_banner
expect
(
banner
).
to
have_secondary_read_only_banner
...
...
qa/qa/specs/features/ee/browser_ui/geo/wiki_ssh_push_spec.rb
View file @
56dffeb6
...
@@ -47,6 +47,8 @@ module QA
...
@@ -47,6 +47,8 @@ module QA
validate_content
(
push_content
)
validate_content
(
push_content
)
end
end
QA
::
Runtime
::
Logger
.
debug
(
'Visiting the secondary geo node'
)
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
expect
(
banner
).
to
have_secondary_read_only_banner
expect
(
banner
).
to
have_secondary_read_only_banner
...
...
qa/qa/specs/features/ee/browser_ui/geo/wiki_ssh_push_to_secondary_spec.rb
View file @
56dffeb6
...
@@ -36,6 +36,8 @@ module QA
...
@@ -36,6 +36,8 @@ module QA
end
end
it
'proxies wiki commit to primary node and ultmately replicates to secondary node'
do
it
'proxies wiki commit to primary node and ultmately replicates to secondary node'
do
QA
::
Runtime
::
Logger
.
debug
(
'Visiting the secondary geo node'
)
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
QA
::
Flow
::
Login
.
while_signed_in
(
address: :geo_secondary
)
do
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
EE
::
Page
::
Main
::
Banner
.
perform
do
|
banner
|
expect
(
banner
).
to
have_secondary_read_only_banner
expect
(
banner
).
to
have_secondary_read_only_banner
...
...
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