Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ebd5ced7
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ebd5ced7
编写于
10月 20, 2016
作者:
J
James Lopez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added test events specs and logic. Also fixed some SQL and refactored the pipeline worker spec.
上级
52e2729b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
55 addition
and
10 deletion
+55
-10
app/models/merge_request.rb
app/models/merge_request.rb
+1
-1
lib/gitlab/cycle_analytics/events.rb
lib/gitlab/cycle_analytics/events.rb
+7
-0
lib/gitlab/cycle_analytics/events_fetcher.rb
lib/gitlab/cycle_analytics/events_fetcher.rb
+13
-1
spec/lib/gitlab/cycle_analytics/events_spec.rb
spec/lib/gitlab/cycle_analytics/events_spec.rb
+23
-1
spec/workers/pipeline_metrics_worker_spec.rb
spec/workers/pipeline_metrics_worker_spec.rb
+11
-7
未找到文件。
app/models/merge_request.rb
浏览文件 @
ebd5ced7
...
...
@@ -232,7 +232,7 @@ class MergeRequest < ActiveRecord::Base
end
def
diff_head_commit
if
persisted?
diff_head_commit
if
persisted?
merge_request_diff
.
head_commit
else
source_branch_head
...
...
lib/gitlab/cycle_analytics/events.rb
浏览文件 @
ebd5ced7
...
...
@@ -34,6 +34,13 @@ module Gitlab
end
end
def
test_events
@fetcher
.
fetch_test_events
.
each
do
|
event
|
event
[
'total_time'
]
=
distance_of_time_in_words
(
event
[
'total_time'
].
to_f
)
event
[
'pipeline'
]
=
::
Ci
::
Pipeline
.
find_by_id
(
event
[
'ci_commit_id'
])
# we may not have a pipeline
end
end
private
def
first_time_reference_commit
(
commits
,
event
)
...
...
lib/gitlab/cycle_analytics/events_fetcher.rb
浏览文件 @
ebd5ced7
...
...
@@ -36,7 +36,7 @@ module Gitlab
base_query
=
base_query_for
(
:code
)
diff_fn
=
subtract_datetimes_diff
(
base_query
,
issue_metrics_table
[
:first_mentioned_in_commit_at
],
issue
_table
[
:created_at
])
mr
_table
[
:created_at
])
query
=
base_query
.
join
(
user_table
).
on
(
issue_table
[
:author_id
].
eq
(
user_table
[
:id
])).
project
(
extract_epoch
(
diff_fn
).
as
(
'total_time'
),
*
code_projections
).
...
...
@@ -45,6 +45,18 @@ module Gitlab
execute
(
query
)
end
def
fetch_test_events
base_query
=
base_query_for
(
:code
)
diff_fn
=
subtract_datetimes_diff
(
base_query
,
mr_metrics_table
[
:latest_build_started_at
],
mr_metrics_table
[
:latest_build_finished_at
])
query
=
base_query
.
project
(
extract_epoch
(
diff_fn
).
as
(
'total_time'
),
mr_metrics_table
[
:ci_commit_id
]).
order
(
mr_table
[
:created_at
].
desc
)
execute
(
query
)
end
private
def
issue_attributes
...
...
spec/lib/gitlab/cycle_analytics/events_spec.rb
浏览文件 @
ebd5ced7
...
...
@@ -55,7 +55,7 @@ describe Gitlab::CycleAnalytics::Events do
end
it
'has the total time'
do
expect
(
subject
.
code_events
.
first
[
'total_time'
]).
to
eq
(
'
2 days
'
)
expect
(
subject
.
code_events
.
first
[
'total_time'
]).
to
eq
(
'
less than a minute
'
)
end
it
'has a title'
do
...
...
@@ -75,6 +75,28 @@ describe Gitlab::CycleAnalytics::Events do
end
end
describe
'#test_events'
do
let!
(
:context
)
{
create
(
:issue
,
project:
project
,
created_at:
2
.
days
.
ago
)
}
let
(
:merge_request
)
{
MergeRequest
.
first
}
let!
(
:pipeline
)
{
create
(
:ci_pipeline
,
ref:
merge_request
.
source_branch
,
sha:
merge_request
.
diff_head_sha
,
project:
context
.
project
)
}
before
do
pipeline
.
run!
pipeline
.
succeed!
end
it
'has the build info as a pipeline'
do
expect
(
subject
.
test_events
.
first
[
'pipeline'
]).
to
eq
(
pipeline
)
end
it
'has the total time'
do
expect
(
subject
.
test_events
.
first
[
'total_time'
]).
to
eq
(
'less than a minute'
)
end
end
def
setup
(
context
)
milestone
=
create
(
:milestone
,
project:
project
)
context
.
update
(
milestone:
milestone
)
...
...
spec/workers/pipeline_metrics_worker_spec.rb
浏览文件 @
ebd5ced7
...
...
@@ -15,32 +15,36 @@ describe PipelineMetricsWorker do
end
describe
'#perform'
do
subject
{
described_class
.
new
.
perform
(
pipeline
.
id
)
}
before
do
described_class
.
new
.
perform
(
pipeline
.
id
)
end
context
'when pipeline is running'
do
let
(
:status
)
{
'running'
}
it
'records the build start time'
do
subject
expect
(
merge_request
.
reload
.
metrics
.
latest_build_started_at
).
to
be_like_time
(
pipeline
.
started_at
)
end
it
'clears the build end time'
do
subject
expect
(
merge_request
.
reload
.
metrics
.
latest_build_finished_at
).
to
be_nil
end
it
'records the pipeline'
do
expect
(
merge_request
.
reload
.
metrics
.
pipeline
).
to
eq
(
pipeline
)
end
end
context
'when pipeline succeeded'
do
let
(
:status
)
{
'success'
}
it
'records the build end time'
do
subject
expect
(
merge_request
.
reload
.
metrics
.
latest_build_finished_at
).
to
be_like_time
(
pipeline
.
finished_at
)
end
it
'records the pipeline'
do
expect
(
merge_request
.
reload
.
metrics
.
pipeline
).
to
eq
(
pipeline
)
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录