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
e779b68a
Commit
e779b68a
authored
Sep 28, 2021
by
Andrejs Cunskis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
E2E: Large project github import test debug improvements
parent
1c2f4bae
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
23 deletions
+18
-23
qa/qa/resource/project.rb
qa/qa/resource/project.rb
+8
-6
qa/qa/resource/project_imported_from_github.rb
qa/qa/resource/project_imported_from_github.rb
+2
-2
qa/qa/specs/features/api/1_manage/import_large_github_repo_spec.rb
...cs/features/api/1_manage/import_large_github_repo_spec.rb
+6
-12
qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb
...s/api/3_create/repository/project_archive_compare_spec.rb
+1
-2
qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb
...atures/browser_ui/1_manage/project/create_project_spec.rb
+1
-1
No files found.
qa/qa/resource/project.rb
View file @
e779b68a
...
@@ -12,13 +12,13 @@ module QA
...
@@ -12,13 +12,13 @@ module QA
:auto_devops_enabled
,
:auto_devops_enabled
,
:github_personal_access_token
,
:github_personal_access_token
,
:github_repository_path
,
:github_repository_path
,
:gitlab_repository_path
:gitlab_repository_path
,
:personal_namespace
attributes
:id
,
attributes
:id
,
:name
,
:name
,
:add_name_uuid
,
:add_name_uuid
,
:description
,
:description
,
:personal_namespace
,
:runners_token
,
:runners_token
,
:visibility
,
:visibility
,
:template_name
,
:template_name
,
...
@@ -31,13 +31,15 @@ module QA
...
@@ -31,13 +31,15 @@ module QA
end
end
attribute
:path_with_namespace
do
attribute
:path_with_namespace
do
"
#{
group
.
full_path
}
/
#{
name
}
"
"
#{
personal_namespace
||
group
.
full_path
}
/
#{
name
}
"
end
end
alias_method
:full_path
,
:path_with_namespace
alias_method
:full_path
,
:path_with_namespace
def
sandbox_path
def
sandbox_path
group
.
respond_to?
(
'sandbox'
)
?
"
#{
group
.
sandbox
.
path
}
/"
:
''
return
''
if
personal_namespace
||
!
group
.
respond_to?
(
'sandbox'
)
"
#{
group
.
sandbox
.
path
}
/"
end
end
attribute
:repository_ssh_location
do
attribute
:repository_ssh_location
do
...
@@ -50,12 +52,12 @@ module QA
...
@@ -50,12 +52,12 @@ module QA
def
initialize
def
initialize
@add_name_uuid
=
true
@add_name_uuid
=
true
@personal_namespace
=
false
@description
=
'My awesome project'
@description
=
'My awesome project'
@initialize_with_readme
=
false
@initialize_with_readme
=
false
@auto_devops_enabled
=
false
@auto_devops_enabled
=
false
@visibility
=
:public
@visibility
=
:public
@template_name
=
nil
@template_name
=
nil
@personal_namespace
=
nil
@import
=
false
@import
=
false
self
.
name
=
"the_awesome_project"
self
.
name
=
"the_awesome_project"
...
@@ -68,7 +70,7 @@ module QA
...
@@ -68,7 +70,7 @@ module QA
def
fabricate!
def
fabricate!
return
if
@import
return
if
@import
if
@
personal_namespace
if
personal_namespace
Page
::
Dashboard
::
Projects
.
perform
(
&
:click_new_project_button
)
Page
::
Dashboard
::
Projects
.
perform
(
&
:click_new_project_button
)
else
else
group
.
visit!
group
.
visit!
...
...
qa/qa/resource/project_imported_from_github.rb
View file @
e779b68a
...
@@ -34,7 +34,7 @@ module QA
...
@@ -34,7 +34,7 @@ module QA
def
fabricate_via_api!
def
fabricate_via_api!
super
super
rescue
ResourceURLMissingError
rescue
ResourceURLMissingError
"
#{
Runtime
::
Scenario
.
gitlab_address
}
/
#{
group
.
full_path
}
/
#{
name
}
"
"
#{
Runtime
::
Scenario
.
gitlab_address
}
/
#{
full_path
}
"
end
end
def
api_post_path
def
api_post_path
...
@@ -49,7 +49,7 @@ module QA
...
@@ -49,7 +49,7 @@ module QA
{
{
repo_id:
github_repo_id
,
repo_id:
github_repo_id
,
new_name:
name
,
new_name:
name
,
target_namespace:
group
.
full_path
,
target_namespace:
@personal_namespace
||
group
.
full_path
,
personal_access_token:
github_personal_access_token
,
personal_access_token:
github_personal_access_token
,
ci_cd_only:
false
ci_cd_only:
false
}
}
...
...
qa/qa/specs/features/api/1_manage/import_large_github_repo_spec.rb
View file @
e779b68a
...
@@ -9,11 +9,6 @@ module QA
...
@@ -9,11 +9,6 @@ module QA
let
(
:differ
)
{
RSpec
::
Support
::
Differ
.
new
(
color:
true
)
}
let
(
:differ
)
{
RSpec
::
Support
::
Differ
.
new
(
color:
true
)
}
let
(
:api_client
)
{
Runtime
::
API
::
Client
.
as_admin
}
let
(
:api_client
)
{
Runtime
::
API
::
Client
.
as_admin
}
let
(
:group
)
do
Resource
::
Group
.
fabricate_via_api!
do
|
resource
|
resource
.
api_client
=
api_client
end
end
let
(
:user
)
do
let
(
:user
)
do
Resource
::
User
.
fabricate_via_api!
do
|
resource
|
Resource
::
User
.
fabricate_via_api!
do
|
resource
|
...
@@ -86,19 +81,15 @@ module QA
...
@@ -86,19 +81,15 @@ module QA
Resource
::
ProjectImportedFromGithub
.
fabricate_via_api!
do
|
project
|
Resource
::
ProjectImportedFromGithub
.
fabricate_via_api!
do
|
project
|
project
.
add_name_uuid
=
false
project
.
add_name_uuid
=
false
project
.
name
=
'imported-project'
project
.
name
=
'imported-project'
project
.
group
=
group
project
.
github_personal_access_token
=
Runtime
::
Env
.
github_access_token
project
.
github_personal_access_token
=
Runtime
::
Env
.
github_access_token
project
.
github_repository_path
=
github_repo
project
.
github_repository_path
=
github_repo
project
.
personal_namespace
=
user
.
username
project
.
api_client
=
api_client
project
.
api_client
=
api_client
end
end
end
end
before
do
group
.
add_member
(
user
,
Resource
::
Members
::
AccessLevel
::
MAINTAINER
)
end
after
do
|
example
|
after
do
|
example
|
user
.
remove_via_api!
user
.
remove_via_api!
unless
example
.
exception
next
unless
defined?
(
@import_time
)
next
unless
defined?
(
@import_time
)
# save data for comparison after run finished
# save data for comparison after run finished
...
@@ -128,7 +119,10 @@ module QA
...
@@ -128,7 +119,10 @@ module QA
)
)
end
end
it
'imports large Github repo via api'
,
testcase:
'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1880'
do
it
(
'imports large Github repo via api'
,
testcase:
'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1880'
)
do
start
=
Time
.
now
start
=
Time
.
now
Runtime
::
Logger
.
info
(
"Importing project '
#{
imported_project
.
full_path
}
'"
)
# import the project and log path
Runtime
::
Logger
.
info
(
"Importing project '
#{
imported_project
.
full_path
}
'"
)
# import the project and log path
...
...
qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb
View file @
e779b68a
...
@@ -46,10 +46,9 @@ module QA
...
@@ -46,10 +46,9 @@ module QA
def
create_project
(
user
,
api_client
,
project_name
)
def
create_project
(
user
,
api_client
,
project_name
)
project
=
Resource
::
Project
.
fabricate_via_api!
do
|
project
|
project
=
Resource
::
Project
.
fabricate_via_api!
do
|
project
|
project
.
personal_namespace
=
tru
e
project
.
personal_namespace
=
user
.
usernam
e
project
.
add_name_uuid
=
false
project
.
add_name_uuid
=
false
project
.
name
=
project_name
project
.
name
=
project_name
project
.
path_with_namespace
=
"
#{
user
.
username
}
/
#{
project_name
}
"
project
.
api_client
=
api_client
project
.
api_client
=
api_client
end
end
...
...
qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb
View file @
e779b68a
...
@@ -39,7 +39,7 @@ module QA
...
@@ -39,7 +39,7 @@ module QA
Resource
::
Project
.
fabricate_via_browser_ui!
do
|
project
|
Resource
::
Project
.
fabricate_via_browser_ui!
do
|
project
|
project
.
name
=
project_name
project
.
name
=
project_name
project
.
description
=
'create awesome project test'
project
.
description
=
'create awesome project test'
project
.
personal_namespace
=
tru
e
project
.
personal_namespace
=
Runtime
::
User
.
usernam
e
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