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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
c0cfc9eb
Commit
c0cfc9eb
authored
Oct 06, 2017
by
Alessio Caiazza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extract `Ci::Build#parse_trace_sections!` into a service
parent
ea023138
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
92 additions
and
35 deletions
+92
-35
app/models/ci/build.rb
app/models/ci/build.rb
+1
-18
app/services/ci/extract_sections_from_build_trace_service.rb
app/services/ci/extract_sections_from_build_trace_service.rb
+30
-0
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+6
-17
spec/services/ci/extract_sections_from_build_trace_service_spec.rb
...ices/ci/extract_sections_from_build_trace_service_spec.rb
+55
-0
No files found.
app/models/ci/build.rb
View file @
c0cfc9eb
...
@@ -267,24 +267,7 @@ module Ci
...
@@ -267,24 +267,7 @@ module Ci
end
end
def
parse_trace_sections!
def
parse_trace_sections!
return
false
unless
trace_sections
.
empty?
ExtractSectionsFromBuildTraceService
.
new
(
project
,
user
).
execute
(
self
)
sections
=
trace
.
extract_sections
.
map
do
|
attr
|
name
=
attr
.
delete
(
:name
)
name_record
=
begin
project
.
build_trace_section_names
.
find_or_create_by!
(
name:
name
)
rescue
ActiveRecord
::
RecordInvalid
project
.
build_trace_section_names
.
find_by!
(
name:
name
)
end
attr
.
merge
(
build_id:
self
.
id
,
project_id:
self
.
project_id
,
section_name_id:
name_record
.
id
)
end
Gitlab
::
Database
.
bulk_insert
(
Ci
::
BuildTraceSection
.
table_name
,
sections
)
true
end
end
def
trace
def
trace
...
...
app/services/ci/extract_sections_from_build_trace_service.rb
0 → 100644
View file @
c0cfc9eb
module
Ci
class
ExtractSectionsFromBuildTraceService
<
BaseService
def
execute
(
build
)
return
false
unless
build
.
trace_sections
.
empty?
Gitlab
::
Database
.
bulk_insert
(
BuildTraceSection
.
table_name
,
extract_sections
(
build
))
true
end
private
def
find_or_create_name
(
name
)
project
.
build_trace_section_names
.
find_or_create_by!
(
name:
name
)
rescue
ActiveRecord
::
RecordInvalid
project
.
build_trace_section_names
.
find_by!
(
name:
name
)
end
def
extract_sections
(
build
)
build
.
trace
.
extract_sections
.
map
do
|
attr
|
name
=
attr
.
delete
(
:name
)
name_record
=
find_or_create_name
(
name
)
attr
.
merge
(
build_id:
build
.
id
,
project_id:
project
.
id
,
section_name_id:
name_record
.
id
)
end
end
end
end
spec/models/ci/build_spec.rb
View file @
c0cfc9eb
...
@@ -322,24 +322,13 @@ describe Ci::Build do
...
@@ -322,24 +322,13 @@ describe Ci::Build do
end
end
describe
'#parse_trace_sections!'
do
describe
'#parse_trace_sections!'
do
context
"when the build trace has sections markers,"
do
it
'calls ExtractSectionsFromBuildTraceService'
do
before
do
expect
(
Ci
::
ExtractSectionsFromBuildTraceService
)
build
.
trace
.
set
(
File
.
read
(
expand_fixture_path
(
'trace/trace_with_sections'
)))
.
to
receive
(
:new
).
with
(
project
,
build
.
user
).
once
.
and_call_original
end
expect_any_instance_of
(
Ci
::
ExtractSectionsFromBuildTraceService
)
.
to
receive
(
:execute
).
with
(
build
).
once
it
"saves the correct extracted sections"
do
expect
(
build
.
trace_sections
).
to
be_empty
expect
(
build
.
parse_trace_sections!
).
to
be
(
true
)
expect
(
build
.
trace_sections
).
not_to
be_empty
end
it
"fails if trace_sections isn't empty"
do
expect
(
build
.
parse_trace_sections!
).
to
be
(
true
)
expect
(
build
.
trace_sections
).
not_to
be_empty
expect
(
build
.
parse_trace_sections!
).
to
be
(
false
)
build
.
parse_trace_sections!
expect
(
build
.
trace_sections
).
not_to
be_empty
end
end
end
end
end
...
...
spec/services/ci/extract_sections_from_build_trace_service_spec.rb
0 → 100644
View file @
c0cfc9eb
require
'spec_helper'
describe
Ci
::
ExtractSectionsFromBuildTraceService
,
'#execute'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:build
)
{
create
(
:ci_build
,
project:
project
)
}
subject
{
described_class
.
new
(
project
,
user
)
}
shared_examples
'build trace has sections markers'
do
before
do
build
.
trace
.
set
(
File
.
read
(
expand_fixture_path
(
'trace/trace_with_sections'
)))
end
it
'saves the correct extracted sections'
do
expect
(
build
.
trace_sections
).
to
be_empty
expect
(
subject
.
execute
(
build
)).
to
be
(
true
)
expect
(
build
.
trace_sections
).
not_to
be_empty
end
it
"fails if trace_sections isn't empty"
do
expect
(
subject
.
execute
(
build
)).
to
be
(
true
)
expect
(
build
.
trace_sections
).
not_to
be_empty
expect
(
subject
.
execute
(
build
)).
to
be
(
false
)
expect
(
build
.
trace_sections
).
not_to
be_empty
end
end
shared_examples
'build trace has no sections markers'
do
before
do
build
.
trace
.
set
(
'no markerts'
)
end
it
'extracts no sections'
do
expect
(
build
.
trace_sections
).
to
be_empty
expect
(
subject
.
execute
(
build
)).
to
be
(
true
)
expect
(
build
.
trace_sections
).
to
be_empty
end
end
context
'when the build has no user'
do
it_behaves_like
'build trace has sections markers'
it_behaves_like
'build trace has no sections markers'
end
context
'when the build has a valid user'
do
before
do
build
.
user
=
user
end
it_behaves_like
'build trace has sections markers'
it_behaves_like
'build trace has no sections markers'
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