Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
be7a97ee
J
jenkins
项目概览
FIY695
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
be7a97ee
编写于
2月 02, 2014
作者:
S
Stefan Wolf
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-17606] Reuse existing fingerprint action if present.
Prevents multiple FingerprintActions.
上级
931d2960
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
36 addition
and
7 deletion
+36
-7
changelog.html
changelog.html
+3
-0
core/src/main/java/hudson/tasks/Fingerprinter.java
core/src/main/java/hudson/tasks/Fingerprinter.java
+6
-1
test/src/test/java/hudson/tasks/FingerprinterTest.java
test/src/test/java/hudson/tasks/FingerprinterTest.java
+27
-6
未找到文件。
changelog.html
浏览文件 @
be7a97ee
...
...
@@ -82,6 +82,9 @@ Upcoming changes</a>
<li
class=
bug
>
Wrong log message for out-of-order build record repair.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-20730"
>
issue 20730
</a>
)
<li
class=
bug
>
Existing Fingerprint Action is reused and not added a second time.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-17606"
>
issue 19832
</a>
)
</ul>
</div>
<!--=TRUNK-END=-->
...
...
core/src/main/java/hudson/tasks/Fingerprinter.java
浏览文件 @
be7a97ee
...
...
@@ -132,7 +132,12 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD
record
(
build
,
listener
,
record
,
expandedArtifacts
);
}
build
.
addAction
(
new
FingerprintAction
(
build
,
record
));
FingerprintAction
fingerprintAction
=
build
.
getAction
(
FingerprintAction
.
class
);
if
(
fingerprintAction
!=
null
)
{
fingerprintAction
.
add
(
record
);
}
else
{
build
.
addAction
(
new
FingerprintAction
(
build
,
record
));
}
if
(
enableFingerprintsInDependencyGraph
)
{
Jenkins
.
getInstance
().
rebuildDependencyGraphAsync
();
...
...
test/src/test/java/hudson/tasks/FingerprinterTest.java
浏览文件 @
be7a97ee
...
...
@@ -24,17 +24,15 @@
package
hudson.tasks
;
import
com.google.common.collect.ImmutableMap
;
import
com.google.common.collect.ImmutableSet
;
import
hudson.Launcher
;
import
hudson.Util
;
import
hudson.XmlFile
;
import
hudson.matrix.Axis
;
import
hudson.matrix.AxisList
;
import
hudson.matrix.MatrixProject
;
import
hudson.model.AbstractProject
;
import
hudson.model.Fingerprint
;
import
hudson.model.FingerprintCleanupThread
;
import
hudson.model.FreeStyleBuild
;
import
hudson.model.FreeStyleProject
;
import
hudson.model.Result
;
import
hudson.model.*
;
import
hudson.util.RunList
;
import
java.io.File
;
...
...
@@ -43,10 +41,13 @@ import java.util.Arrays;
import
java.util.Collection
;
import
java.util.HashSet
;
import
java.util.List
;
import
static
org
.
hamcrest
.
Matchers
.
hasSize
;
import
static
org
.
junit
.
Assert
.*;
import
hudson.util.StreamTaskListener
;
import
jenkins.model.Jenkins
;
import
org.hamcrest.Matchers
;
import
org.junit.BeforeClass
;
import
org.junit.Rule
;
import
org.junit.Test
;
...
...
@@ -111,6 +112,26 @@ public class FingerprinterTest {
assertTrue
(
downstreamProjects
.
contains
(
downstream
));
}
private
static
class
FingerprintAddingBuilder
extends
Builder
{
@Override
public
boolean
perform
(
AbstractBuild
<?,
?>
build
,
Launcher
launcher
,
BuildListener
listener
)
throws
InterruptedException
,
IOException
{
build
.
addAction
(
new
Fingerprinter
.
FingerprintAction
(
build
,
ImmutableMap
.
of
(
singleFiles2
[
0
],
"fakefingerprint"
)));
return
true
;
}
}
@Test
public
void
presentFingerprintActionIsReused
()
throws
Exception
{
FreeStyleProject
project
=
createFreeStyleProjectWithFingerprints
(
singleContents
,
singleFiles
);
project
.
getBuildersList
().
add
(
new
FingerprintAddingBuilder
());
FreeStyleBuild
build
=
j
.
buildAndAssertSuccess
(
project
);
assertThat
(
build
.
getActions
(
Fingerprinter
.
FingerprintAction
.
class
),
hasSize
(
1
));
Fingerprinter
.
FingerprintAction
action
=
build
.
getAction
(
Fingerprinter
.
FingerprintAction
.
class
);
assertEquals
(
action
.
getRecords
().
keySet
(),
ImmutableSet
.
of
(
singleFiles2
[
0
],
singleFiles
[
0
]));
}
@Test
public
void
multipleUpstreamDependencies
()
throws
Exception
{
FreeStyleProject
upstream
=
createFreeStyleProjectWithFingerprints
(
singleContents
,
singleFiles
);
FreeStyleProject
upstream2
=
createFreeStyleProjectWithFingerprints
(
singleContents2
,
singleFiles2
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录