Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
ef26f8a8
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,发现更多精彩内容 >>
提交
ef26f8a8
编写于
9月 28, 2013
作者:
L
lvotypko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Better wait until build is finshed and remove existing CauseAction.
上级
0ebd8a6c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
12 deletion
+9
-12
test/src/test/java/hudson/model/UserTest.java
test/src/test/java/hudson/model/UserTest.java
+9
-12
未找到文件。
test/src/test/java/hudson/model/UserTest.java
浏览文件 @
ef26f8a8
...
...
@@ -28,6 +28,7 @@ import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
import
com.gargoylesoftware.htmlunit.WebAssert
;
import
com.gargoylesoftware.htmlunit.html.HtmlForm
;
import
com.gargoylesoftware.htmlunit.html.HtmlPage
;
import
hudson.model.Cause.UserIdCause
;
import
hudson.security.AccessDeniedException2
;
import
hudson.security.GlobalMatrixAuthorizationStrategy
;
import
hudson.security.HudsonPrivateSecurityRealm
;
...
...
@@ -224,7 +225,7 @@ public class UserTest {
}
@Test
public
void
testGetBuildsAndGetProjects
()
throws
IOException
,
Interrupted
Exception
{
public
void
testGetBuildsAndGetProjects
()
throws
Exception
{
User
user
=
User
.
get
(
"John Smith"
,
true
,
Collections
.
emptyMap
());
FreeStyleProject
project
=
j
.
createFreeStyleProject
(
"free"
);
FreeStyleProject
project2
=
j
.
createFreeStyleProject
(
"free2"
);
...
...
@@ -232,24 +233,20 @@ public class UserTest {
FakeChangeLogSCM
scm
=
new
FakeChangeLogSCM
();
scm
.
addChange
().
withAuthor
(
user
.
getId
());
project
.
setScm
(
scm
);
Queue
.
getInstance
().
schedule
(
project
,
0
);
j
.
buildAndAssertSuccess
(
project
);
j
.
buildAndAssertSuccess
(
project2
);
Build
build
=
project
.
getLastBuild
();
while
(
build
==
null
){
Thread
.
sleep
(
100
);
build
=
project
.
getLastBuild
();
}
Queue
.
getInstance
().
schedule
(
project2
,
0
);
Build
build2
=
project2
.
getLastBuild
();
while
(
build2
==
null
){
Thread
.
sleep
(
100
);
build2
=
project2
.
getLastBuild
();
}
assertTrue
(
"User should participate in the last build of project free."
,
user
.
getBuilds
().
contains
(
build
));
assertFalse
(
"User should not participate in the last build of project free2."
,
user
.
getBuilds
().
contains
(
build2
));
assertTrue
(
"User should participate in the project free."
,
user
.
getProjects
().
contains
(
project
));
assertFalse
(
"User should not participate in the project free2."
,
user
.
getProjects
().
contains
(
project2
));
//JENKINS-16178: build should include also builds scheduled by user
CauseAction
action
=
build2
.
getAction
(
CauseAction
.
class
);
//remove existing cause action
if
(
action
!=
null
)
build2
.
getActions
().
remove
(
action
);
build2
.
addAction
(
new
CauseAction
(
new
Cause
.
UserIdCause
()));
assertFalse
(
"User should not participate in the last build of project free2."
,
user
.
getBuilds
().
contains
(
build2
));
assertFalse
(
"Current user should not participate in the last build of project free."
,
User
.
current
().
getBuilds
().
contains
(
build
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录