Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
0fca3bce
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,发现更多精彩内容 >>
提交
0fca3bce
编写于
2月 23, 2018
作者:
S
Shinya Maeda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Copy original file to temp file always to prevent data loss
上级
801e4271
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
33 addition
and
17 deletion
+33
-17
app/services/ci/create_trace_artifact_service.rb
app/services/ci/create_trace_artifact_service.rb
+4
-4
spec/services/ci/create_trace_artifact_service_spec.rb
spec/services/ci/create_trace_artifact_service_spec.rb
+29
-13
未找到文件。
app/services/ci/create_trace_artifact_service.rb
浏览文件 @
0fca3bce
...
...
@@ -8,7 +8,7 @@ module Ci
temp_file!
(
JobArtifactUploader
.
workhorse_upload_path
)
do
|
temp_path
|
FileUtils
.
cp
(
stream
.
path
,
temp_path
)
create_job_trace!
(
temp_path
)
create_job_trace!
(
job
,
temp_path
)
FileUtils
.
rm
(
stream
.
path
)
end
end
...
...
@@ -16,17 +16,17 @@ module Ci
private
def
create_job_trace!
(
path
)
def
create_job_trace!
(
job
,
path
)
job
.
create_job_artifacts_trace!
(
project:
job
.
project
,
file_type: :trace
,
file:
UploadedFile
.
new
(
path
,
'
build
.log'
,
'application/octet-stream'
)
file:
UploadedFile
.
new
(
path
,
'
job
.log'
,
'application/octet-stream'
)
)
end
def
temp_file!
(
temp_dir
)
FileUtils
.
mkdir_p
(
temp_dir
)
temp_file
=
Tempfile
.
new
(
'
file
'
,
temp_dir
)
temp_file
=
Tempfile
.
new
(
'
legacy-trace-tmp-
'
,
temp_dir
)
temp_file
&
.
close
yield
(
temp_file
.
path
)
ensure
...
...
spec/services/ci/create_trace_artifact_service_spec.rb
浏览文件 @
0fca3bce
...
...
@@ -4,40 +4,56 @@ describe Ci::CreateTraceArtifactService do
describe
'#execute'
do
subject
{
described_class
.
new
(
nil
,
nil
).
execute
(
job
)
}
let
(
:job
)
{
create
(
:ci_build
)
}
context
'when the job does not have trace artifact'
do
context
'when the job has a trace file'
do
before
do
allow_any_instance_of
(
Gitlab
::
Ci
::
Trace
)
.
to
receive
(
:default_path
)
{
expand_fixture_path
(
'trace/sample_trace'
)
}
let!
(
:job
)
{
create
(
:ci_build
,
:trace_live
)
}
let!
(
:legacy_path
)
{
job
.
trace
.
read
{
|
stream
|
return
stream
.
path
}
}
allow_any_instance_of
(
JobArtifactUploader
).
to
receive
(
:move_to_cache
)
{
false
}
allow_any_instance_of
(
JobArtifactUploader
).
to
receive
(
:move_to_store
)
{
false
}
end
it
{
expect
(
File
.
exists?
(
legacy_path
)).
to
be_truthy
}
it
'creates trace artifact'
do
expect
{
subject
}.
to
change
{
Ci
::
JobArtifact
.
count
}.
by
(
1
)
expect
(
job
.
job_artifacts_trace
.
read_attribute
(
:file
)).
to
eq
(
'sample_trace'
)
expect
(
File
.
exists?
(
legacy_path
)).
to
be_falsy
expect
(
File
.
exists?
(
job
.
job_artifacts_trace
.
file
.
path
)).
to
be_truthy
expect
(
job
.
job_artifacts_trace
.
exists?
).
to
be_truthy
expect
(
job
.
job_artifacts_trace
.
file
.
filename
).
to
eq
(
'job.log'
)
end
context
'when
the job has already had trace artifact
'
do
context
'when
failed to create trace artifact record
'
do
before
do
create
(
:ci_job_artifact
,
:trace
,
job:
job
)
# When ActiveRecord error happens
allow_any_instance_of
(
Ci
::
JobArtifact
).
to
receive
(
:save
).
and_return
(
false
)
allow_any_instance_of
(
Ci
::
JobArtifact
).
to
receive_message_chain
(
:errors
,
:full_messages
)
.
and_return
(
"Error"
)
subject
rescue
nil
job
.
reload
end
it
'does not create trace artifact'
do
expect
{
subject
}.
not_to
change
{
Ci
::
JobArtifact
.
count
}
it
'keeps legacy trace and removes trace artifact'
do
expect
(
File
.
exists?
(
legacy_path
)).
to
be_truthy
expect
(
job
.
job_artifacts_trace
).
to
be_nil
end
end
end
context
'when the job does not have a trace file'
do
let!
(
:job
)
{
create
(
:ci_build
)
}
it
'does not create trace artifact'
do
expect
{
subject
}.
not_to
change
{
Ci
::
JobArtifact
.
count
}
end
end
end
context
'when the job has already had trace artifact'
do
let!
(
:job
)
{
create
(
:ci_build
,
:trace_artifact
)
}
it
'does not create trace artifact'
do
expect
{
subject
}.
not_to
change
{
Ci
::
JobArtifact
.
count
}
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录