Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
b204bd07
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,发现更多精彩内容 >>
提交
b204bd07
编写于
8月 24, 2015
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-28840] Cancel the test timer only after we call Jenkins.cleanUp, in case that hung.
Merges #1809.
上级
434608ba
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
130 addition
and
5 deletion
+130
-5
test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
+5
-5
test/src/test/java/org/jvnet/hudson/main/JenkinsRuleTimeoutTest.java
...st/java/org/jvnet/hudson/main/JenkinsRuleTimeoutTest.java
+125
-0
未找到文件。
test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
浏览文件 @
b204bd07
...
...
@@ -426,11 +426,6 @@ public class JenkinsRule implements TestRule, MethodRule, RootAction {
tl
.
onTearDown
();
}
if
(
timeoutTimer
!=
null
)
{
timeoutTimer
.
cancel
();
timeoutTimer
=
null
;
}
// cancel pending asynchronous operations, although this doesn't really seem to be working
for
(
WebClient
client
:
clients
)
{
// unload the page to cancel asynchronous operations
...
...
@@ -467,6 +462,11 @@ public class JenkinsRule implements TestRule, MethodRule, RootAction {
x
.
printStackTrace
();
}
if
(
timeoutTimer
!=
null
)
{
timeoutTimer
.
cancel
();
timeoutTimer
=
null
;
}
// Hudson creates ClassLoaders for plugins that hold on to file descriptors of its jar files,
// but because there's no explicit dispose method on ClassLoader, they won't get GC-ed until
// at some later point, leading to possible file descriptor overflow. So encourage GC now.
...
...
test/src/test/java/org/jvnet/hudson/main/JenkinsRuleTimeoutTest.java
0 → 100644
浏览文件 @
b204bd07
/*
* The MIT License
*
* Copyright 2015 CloudBees, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package
org.jvnet.hudson.main
;
import
hudson.model.listeners.ItemListener
;
import
org.junit.Ignore
;
import
org.junit.Test
;
import
org.junit.Rule
;
import
org.jvnet.hudson.test.JenkinsRule
;
import
org.jvnet.hudson.test.TestExtension
;
public
class
JenkinsRuleTimeoutTest
{
@Rule
public
JenkinsRule
r
=
new
JenkinsRule
();
{
r
.
timeout
=
10
;
// let us not wait three minutes!
}
@Test
public
void
hangInterruptiblyInTest
()
throws
Exception
{
try
{
hangInterruptibly
();
}
catch
(
InterruptedException
x
)
{
System
.
err
.
println
(
"Interrupted, good."
);
}
}
@Ignore
(
"TODO ought to use the idiom from org.junit.internal.runners.statements.FailOnTimeout: "
+
"run test in its own thread so we can fail even if it does not respond to interruptions"
)
@Test
public
void
hangUninterruptiblyInTest
()
throws
Exception
{
hangUninterruptibly
();
}
@Test
public
void
hangInterruptiblyInShutdown
()
throws
Exception
{
System
.
err
.
println
(
"Test itself passed…"
);
}
@TestExtension
(
"hangInterruptiblyInShutdown"
)
public
static
class
HangsInterruptibly
extends
ItemListener
{
@Override
public
void
onBeforeShutdown
()
{
try
{
hangInterruptibly
();
}
catch
(
InterruptedException
x
)
{
System
.
err
.
println
(
"Interrupted, good."
);
}
}
}
@Ignore
(
"TODO ditto"
)
@Test
public
void
hangUninterruptiblyInShutdown
()
throws
Exception
{
System
.
err
.
println
(
"Test itself passed…"
);
}
@TestExtension
(
"hangUninterruptiblyInShutdown"
)
public
static
class
HangsUninterruptibly
extends
ItemListener
{
@Override
public
void
onBeforeShutdown
()
{
hangUninterruptibly
();
}
}
private
static
void
hangInterruptibly
()
throws
InterruptedException
{
Thread
.
sleep
(
Long
.
MAX_VALUE
);
}
@SuppressWarnings
(
"SleepWhileHoldingLock"
)
private
static
void
hangUninterruptibly
()
{
// Adapted from http://stackoverflow.com/a/22489064/12916
final
Object
a
=
new
Object
();
final
Object
b
=
new
Object
();
new
Thread
(
"other"
)
{
@Override
public
void
run
()
{
synchronized
(
a
)
{
try
{
Thread
.
sleep
(
3000
);
}
catch
(
InterruptedException
exc
)
{
System
.
err
.
println
(
"interrupted t1"
);
}
synchronized
(
b
)
{
assert
false
:
"should not get here"
;
}
}
}
}.
start
();
synchronized
(
b
)
{
try
{
Thread
.
sleep
(
3000
);
}
catch
(
InterruptedException
exc
)
{
System
.
err
.
println
(
"interrupted t2"
);
}
synchronized
(
a
)
{
assert
false
:
"should not get here"
;
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录