Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
23ade1cd
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,发现更多精彩内容 >>
提交
23ade1cd
编写于
9月 21, 2012
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-15271] NPE in <code>MatrixProject.onLoad</code>.
上级
ec3005e1
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
41 addition
and
1 deletion
+41
-1
changelog.html
changelog.html
+4
-0
core/src/main/java/hudson/matrix/MatrixProject.java
core/src/main/java/hudson/matrix/MatrixProject.java
+1
-1
test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy
test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy
+16
-0
test/src/test/resources/hudson/matrix/MatrixProjectTest/testUpgrade/config.xml
...es/hudson/matrix/MatrixProjectTest/testUpgrade/config.xml
+1
-0
test/src/test/resources/hudson/matrix/MatrixProjectTest/testUpgrade/jobs/x/config.xml
...on/matrix/MatrixProjectTest/testUpgrade/jobs/x/config.xml
+19
-0
未找到文件。
changelog.html
浏览文件 @
23ade1cd
...
...
@@ -58,8 +58,12 @@ Upcoming changes</a>
<li
class=
bug
>
Displaying
<code>
/people
</code>
can consume huge resources.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-15206"
>
issue 15206
</a>
)
<li
class=
bug
>
Log recorders do not work reliably.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-15226"
>
issue 15226
</a>
)
<li
class=
bug
>
NPE in
<code>
MatrixProject.onLoad
</code>
.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-15271"
>
issue 15271
</a>
)
<li
class=
bug
>
<code>
FilePath.validateAntFileMask
</code>
too slow for
<code>
/configure
</code>
.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-7214"
>
issue 7214
</a>
)
...
...
core/src/main/java/hudson/matrix/MatrixProject.java
浏览文件 @
23ade1cd
...
...
@@ -471,7 +471,7 @@ public class MatrixProject extends AbstractProject<MatrixProject,MatrixBuild> im
buildWrappers
.
setOwner
(
this
);
if
(
executionStrategy
==
null
)
executionStrategy
=
new
DefaultMatrixExecutionStrategyImpl
(
runSequentially
,
touchStoneCombinationFilter
,
touchStoneResultCondition
,
sorter
);
executionStrategy
=
new
DefaultMatrixExecutionStrategyImpl
(
runSequentially
!=
null
?
runSequentially
:
false
,
touchStoneCombinationFilter
,
touchStoneResultCondition
,
sorter
);
rebuildConfigurations
(
null
);
}
...
...
test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy
浏览文件 @
23ade1cd
...
...
@@ -35,6 +35,7 @@ import org.jvnet.hudson.test.Email
import
org.jvnet.hudson.test.HudsonTestCase
import
org.jvnet.hudson.test.SingleFileSCM
import
org.jvnet.hudson.test.UnstableBuilder
import
org.jvnet.hudson.test.recipes.LocalData
;
import
com.gargoylesoftware.htmlunit.html.HtmlTable
import
org.jvnet.hudson.test.Bug
import
org.jvnet.hudson.test.TestBuilder
...
...
@@ -431,4 +432,19 @@ public class MatrixProjectTest extends HudsonTestCase {
//~ assertNotNull(run.getAction(RevisionParameterAction.class));
//~ }
//~ }
@Bug
(
15271
)
@LocalData
public
void
testUpgrade
()
throws
Exception
{
MatrixProject
p
=
jenkins
.
getItemByFullName
(
"x"
,
MatrixProject
.
class
);
assertNotNull
(
p
);
MatrixExecutionStrategy
executionStrategy
=
p
.
getExecutionStrategy
();
assertEquals
(
DefaultMatrixExecutionStrategyImpl
.
class
,
executionStrategy
.
getClass
());
DefaultMatrixExecutionStrategyImpl
defaultExecutionStrategy
=
(
DefaultMatrixExecutionStrategyImpl
)
executionStrategy
;
assertFalse
(
defaultExecutionStrategy
.
isRunSequentially
());
assertNull
(
defaultExecutionStrategy
.
getTouchStoneCombinationFilter
());
assertNull
(
defaultExecutionStrategy
.
getTouchStoneResultCondition
());
assertNull
(
defaultExecutionStrategy
.
getSorter
());
}
}
test/src/test/resources/hudson/matrix/MatrixProjectTest/testUpgrade/config.xml
0 → 100644
浏览文件 @
23ade1cd
<hudson/>
test/src/test/resources/hudson/matrix/MatrixProjectTest/testUpgrade/jobs/x/config.xml
0 → 100644
浏览文件 @
23ade1cd
<?xml version='1.0' encoding='UTF-8'?>
<matrix-project>
<actions/>
<description></description>
<keepDependencies>
false
</keepDependencies>
<properties/>
<scm
class=
"hudson.scm.NullSCM"
/>
<canRoam>
true
</canRoam>
<disabled>
false
</disabled>
<blockBuildWhenDownstreamBuilding>
false
</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>
false
</blockBuildWhenUpstreamBuilding>
<triggers
class=
"vector"
/>
<concurrentBuild>
false
</concurrentBuild>
<axes/>
<builders/>
<publishers/>
<buildWrappers/>
<!-- somehow not here: <runSequentially>false</runSequentially> -->
</matrix-project>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录