Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
57efbea3
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
57efbea3
编写于
4月 14, 2015
作者:
S
Stephen Connolly
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2 from oleg-nenashev/JENKINS-27871
[JENKINS-27871] - Added a direct unit test for the issue
上级
5880ed83
7514e8c6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
36 addition
and
1 deletion
+36
-1
test/src/test/java/hudson/model/QueueTest.java
test/src/test/java/hudson/model/QueueTest.java
+36
-1
未找到文件。
test/src/test/java/hudson/model/QueueTest.java
浏览文件 @
57efbea3
...
...
@@ -50,6 +50,7 @@ import hudson.security.SparseACL;
import
hudson.slaves.DumbSlave
;
import
hudson.slaves.DummyCloudImpl
;
import
hudson.slaves.NodeProvisionerRule
;
import
hudson.tasks.BuildTrigger
;
import
hudson.tasks.Shell
;
import
hudson.triggers.SCMTrigger.SCMTriggerCause
;
import
hudson.triggers.TimerTrigger.TimerTriggerCause
;
...
...
@@ -91,6 +92,7 @@ import org.jvnet.hudson.test.Issue;
import
org.jvnet.hudson.test.JenkinsRule
;
import
org.jvnet.hudson.test.MockQueueItemAuthenticator
;
import
org.jvnet.hudson.test.SequenceLock
;
import
org.jvnet.hudson.test.SleepBuilder
;
import
org.jvnet.hudson.test.TestBuilder
;
import
org.jvnet.hudson.test.recipes.LocalData
;
import
org.mortbay.jetty.Server
;
...
...
@@ -707,5 +709,38 @@ public class QueueTest {
fail
(
"Expected an CancellationException to be thrown"
);
}
catch
(
CancellationException
e
)
{}
}
@Issue
(
"JENKINS-27871"
)
@Test
public
void
testBlockBuildWhenUpstreamBuildingLock
()
throws
Exception
{
final
String
prefix
=
"JENKINS-27871"
;
r
.
getInstance
().
setNumExecutors
(
4
);
r
.
getInstance
().
save
();
final
FreeStyleProject
projectA
=
r
.
createFreeStyleProject
(
prefix
+
"A"
);
projectA
.
getBuildersList
().
add
(
new
SleepBuilder
(
5000
));
final
FreeStyleProject
projectB
=
r
.
createFreeStyleProject
(
prefix
+
"B"
);
projectB
.
getBuildersList
().
add
(
new
SleepBuilder
(
10000
));
projectB
.
setBlockBuildWhenUpstreamBuilding
(
true
);
final
FreeStyleProject
projectC
=
r
.
createFreeStyleProject
(
prefix
+
"C"
);
projectC
.
getBuildersList
().
add
(
new
SleepBuilder
(
10000
));
projectC
.
setBlockBuildWhenUpstreamBuilding
(
true
);
projectA
.
getPublishersList
().
add
(
new
BuildTrigger
(
Arrays
.
asList
(
projectB
),
Result
.
SUCCESS
));
projectB
.
getPublishersList
().
add
(
new
BuildTrigger
(
Arrays
.
asList
(
projectC
),
Result
.
SUCCESS
));
final
QueueTaskFuture
<
FreeStyleBuild
>
taskA
=
projectA
.
scheduleBuild2
(
0
,
new
TimerTriggerCause
());
Thread
.
sleep
(
1000
);
final
QueueTaskFuture
<
FreeStyleBuild
>
taskB
=
projectB
.
scheduleBuild2
(
0
,
new
TimerTriggerCause
());
final
QueueTaskFuture
<
FreeStyleBuild
>
taskC
=
projectC
.
scheduleBuild2
(
0
,
new
TimerTriggerCause
());
final
FreeStyleBuild
buildA
=
taskA
.
get
(
60
,
TimeUnit
.
SECONDS
);
final
FreeStyleBuild
buildB
=
taskB
.
get
(
60
,
TimeUnit
.
SECONDS
);
final
FreeStyleBuild
buildC
=
taskC
.
get
(
60
,
TimeUnit
.
SECONDS
);
long
buildBEndTime
=
buildB
.
getStartTimeInMillis
()
+
buildB
.
getDuration
();
assertTrue
(
"Project B build should be finished before the build of project C starts. "
+
"B finished at "
+
buildBEndTime
+
", C started at "
+
buildC
.
getStartTimeInMillis
(),
buildC
.
getStartTimeInMillis
()
>=
buildBEndTime
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录