Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
eb39e8d5
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,发现更多精彩内容 >>
提交
eb39e8d5
编写于
7月 25, 2018
作者:
D
Devin Nusbaum
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add regression test for JENKINS-41127
上级
33155b16
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
26 addition
and
0 deletion
+26
-0
test/src/test/java/hudson/model/QueueTest.java
test/src/test/java/hudson/model/QueueTest.java
+26
-0
未找到文件。
test/src/test/java/hudson/model/QueueTest.java
浏览文件 @
eb39e8d5
...
@@ -123,6 +123,7 @@ import java.util.concurrent.TimeoutException;
...
@@ -123,6 +123,7 @@ import java.util.concurrent.TimeoutException;
import
java.util.concurrent.atomic.AtomicInteger
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
java.util.logging.Level
;
import
java.util.logging.Level
;
import
static
org
.
hamcrest
.
Matchers
.
contains
;
import
static
org
.
hamcrest
.
Matchers
.
nullValue
;
import
static
org
.
hamcrest
.
Matchers
.
nullValue
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
junit
.
Assert
.*;
import
org.junit.Ignore
;
import
org.junit.Ignore
;
...
@@ -458,6 +459,31 @@ public class QueueTest {
...
@@ -458,6 +459,31 @@ public class QueueTest {
assert
task
.
exec
instanceof
OneOffExecutor
:
task
.
exec
;
assert
task
.
exec
instanceof
OneOffExecutor
:
task
.
exec
;
}
}
@Issue
(
"JENKINS-41127"
)
@Test
public
void
flyweightTasksUnwantedConcurrency
()
throws
Exception
{
Label
label
=
r
.
jenkins
.
getSelfLabel
();
AtomicInteger
cnt
=
new
AtomicInteger
();
TestFlyweightTask
task1
=
new
TestFlyweightTask
(
cnt
,
label
);
TestFlyweightTask
task2
=
new
TestFlyweightTask
(
cnt
,
label
);
assertFalse
(
task1
.
isConcurrentBuild
());
assertFalse
(
task2
.
isConcurrentBuild
());
// We need to call Queue#maintain without any interleaving Queue modification to reproduce the issue.
Queue
.
withLock
(()
->
{
r
.
jenkins
.
getQueue
().
schedule2
(
task1
,
0
);
r
.
jenkins
.
getQueue
().
maintain
();
Queue
.
Item
item1
=
r
.
jenkins
.
getQueue
().
getItem
(
task1
);
assertThat
(
r
.
jenkins
.
getQueue
().
getPendingItems
(),
contains
(
item1
));
r
.
jenkins
.
getQueue
().
schedule2
(
task2
,
0
);
r
.
jenkins
.
getQueue
().
maintain
();
Queue
.
Item
item2
=
r
.
jenkins
.
getQueue
().
getItem
(
task2
);
// Before the fix, item1 would no longer be present in the pending items (but would
// still be assigned to a live executor), and item2 would not be blocked, which would
// allow the tasks to execute concurrently.
assertThat
(
r
.
jenkins
.
getQueue
().
getPendingItems
(),
contains
(
item1
));
assertTrue
(
item2
.
isBlocked
());
});
}
@Issue
(
"JENKINS-27256"
)
@Issue
(
"JENKINS-27256"
)
@Test
public
void
inQueueTaskLookupByAPI
()
throws
Exception
{
@Test
public
void
inQueueTaskLookupByAPI
()
throws
Exception
{
FreeStyleProject
p
=
r
.
createFreeStyleProject
();
FreeStyleProject
p
=
r
.
createFreeStyleProject
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录