Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
5ed111f0
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,发现更多精彩内容 >>
提交
5ed111f0
编写于
1月 31, 2015
作者:
R
Ryan Campbell
提交者:
Oliver Gondža
3月 30, 2015
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-26718] Allow runs to be discarded even if their project can't be found by its fullname
(cherry picked from commit
327f7780
)
上级
dc68946f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
3 deletion
+27
-3
core/src/main/java/hudson/diagnosis/OldDataMonitor.java
core/src/main/java/hudson/diagnosis/OldDataMonitor.java
+5
-3
test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
+22
-0
未找到文件。
core/src/main/java/hudson/diagnosis/OldDataMonitor.java
浏览文件 @
5ed111f0
...
...
@@ -355,10 +355,12 @@ public class OldDataMonitor extends AdministrativeMonitor {
private
static
SaveableReference
referTo
(
Saveable
s
)
{
if
(
s
instanceof
Run
)
{
return
new
RunSaveableReference
((
Run
)
s
);
}
else
{
return
new
SimpleSaveableReference
(
s
);
Job
parent
=
((
Run
)
s
).
getParent
();
if
(
Jenkins
.
getInstance
().
getItemByFullName
(
parent
.
getFullName
())
==
parent
)
{
return
new
RunSaveableReference
((
Run
)
s
);
}
}
return
new
SimpleSaveableReference
(
s
);
}
private
static
final
class
SimpleSaveableReference
implements
SaveableReference
{
...
...
test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
浏览文件 @
5ed111f0
...
...
@@ -41,11 +41,16 @@ import java.util.concurrent.ExecutorService;
import
java.util.concurrent.Executors
;
import
java.util.concurrent.Future
;
import
hudson.model.ItemGroup
;
import
hudson.model.Job
;
import
hudson.model.Run
;
import
hudson.model.Saveable
;
import
hudson.model.listeners.SaveableListener
;
import
jenkins.model.Jenkins
;
import
jenkins.model.lazy.BuildReference
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
Mockito
.*;
import
org.junit.Ignore
;
import
org.junit.Rule
;
import
org.junit.Test
;
...
...
@@ -56,6 +61,8 @@ import org.jvnet.hudson.test.MemoryAssert;
import
org.jvnet.hudson.test.recipes.LocalData
;
import
org.kohsuke.stapler.Stapler
;
import
javax.annotation.Nonnull
;
public
class
OldDataMonitorTest
{
static
{
...
...
@@ -149,6 +156,21 @@ public class OldDataMonitorTest {
}
@Issue
(
"JENKINS-26718"
)
@Test
public
void
unlocatableRun
()
throws
Exception
{
OldDataMonitor
odm
=
OldDataMonitor
.
get
(
r
.
jenkins
);
FreeStyleProject
p
=
mock
(
FreeStyleProject
.
class
);
when
(
p
.
getParent
()).
thenReturn
(
Jenkins
.
getInstance
());
when
(
p
.
getFullName
()).
thenReturn
(
"notfound"
);
FreeStyleBuild
build
=
new
FreeStyleBuild
(
p
);
odm
.
report
(
build
,
(
String
)
null
);
assertEquals
(
Collections
.
singleton
(
build
),
odm
.
getData
().
keySet
());
odm
.
doDiscard
(
null
,
null
);
assertEquals
(
Collections
.
emptySet
(),
odm
.
getData
().
keySet
());
}
public
static
final
class
BadAction
extends
InvisibleAction
{
private
Object
writeReplace
()
{
throw
new
IllegalStateException
(
"broken"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录