Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
013cfc27
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,发现更多精彩内容 >>
提交
013cfc27
编写于
5月 30, 2012
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
run all tests with some time out to avoid infinite hang
上级
6d3a1f5f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
134 addition
and
2 deletion
+134
-2
test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
+31
-2
test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
+28
-0
test/src/main/java/org/jvnet/hudson/test/recipes/WithTimeout.java
.../main/java/org/jvnet/hudson/test/recipes/WithTimeout.java
+75
-0
未找到文件。
test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
浏览文件 @
013cfc27
...
...
@@ -110,6 +110,8 @@ import java.util.Enumeration;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Timer
;
import
java.util.TimerTask
;
import
java.util.UUID
;
import
java.util.concurrent.*
;
import
java.util.jar.Manifest
;
...
...
@@ -253,6 +255,13 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
*/
public
boolean
useLocalPluginManager
;
/**
* Number of seconds until the test times out.
*/
public
int
timeout
=
90
;
private
volatile
Timer
timeoutTimer
;
/**
* Set the plugin manager to be passed to {@link Jenkins} constructor.
*
...
...
@@ -288,7 +297,7 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
}
@Override
protected
void
setUp
()
throws
Exception
{
protected
void
setUp
()
throws
Exception
{
env
.
pin
();
recipe
();
AbstractProject
.
WORKSPACE
.
toString
();
...
...
@@ -335,8 +344,23 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
// allow the test class to inject Jenkins components
jenkins
.
lookup
(
Injector
.
class
).
injectMembers
(
this
);
setUpTimeout
();
}
protected
void
setUpTimeout
()
{
if
(
timeout
<=
0
)
return
;
// no timeout
final
Thread
testThread
=
Thread
.
currentThread
();
timeoutTimer
=
new
Timer
();
timeoutTimer
.
schedule
(
new
TimerTask
()
{
@Override
public
void
run
()
{
if
(
timeoutTimer
!=
null
)
testThread
.
interrupt
();
}
},
TimeUnit
.
SECONDS
.
toMillis
(
timeout
));
}
/**
...
...
@@ -358,6 +382,11 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
@Override
protected
void
tearDown
()
throws
Exception
{
try
{
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
...
...
@@ -384,7 +413,7 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
ExtensionList
.
clearLegacyInstances
();
DescriptorExtensionList
.
clearLegacyInstances
();
//
Hudson
creates ClassLoaders for plugins that hold on to file descriptors of its jar files,
//
Jenkins
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.
// see http://bugs.sun.com/view_bug.do?bug_id=4950148
...
...
test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
浏览文件 @
013cfc27
...
...
@@ -187,6 +187,8 @@ import java.util.Enumeration;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Timer
;
import
java.util.TimerTask
;
import
java.util.UUID
;
import
java.util.concurrent.Callable
;
import
java.util.concurrent.CountDownLatch
;
...
...
@@ -284,6 +286,13 @@ public class JenkinsRule implements TestRule, RootAction {
*/
public
boolean
useLocalPluginManager
;
/**
* Number of seconds until the test times out.
*/
public
int
timeout
=
90
;
private
volatile
Timer
timeoutTimer
;
/**
* Set the plugin manager to be passed to {@link Jenkins} constructor.
*
...
...
@@ -359,11 +368,30 @@ public class JenkinsRule implements TestRule, RootAction {
sites
.
add
(
new
UpdateSite
(
"default"
,
updateCenterUrl
));
}
protected
void
setUpTimeout
()
{
if
(
timeout
<=
0
)
return
;
// no timeout
final
Thread
testThread
=
Thread
.
currentThread
();
timeoutTimer
=
new
Timer
();
timeoutTimer
.
schedule
(
new
TimerTask
()
{
@Override
public
void
run
()
{
if
(
timeoutTimer
!=
null
)
testThread
.
interrupt
();
}
},
TimeUnit
.
SECONDS
.
toMillis
(
timeout
));
}
/**
* Override to tear down your specific external resource.
*/
protected
void
after
()
{
try
{
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
...
...
test/src/main/java/org/jvnet/hudson/test/recipes/WithTimeout.java
0 → 100644
浏览文件 @
013cfc27
/*
* The MIT License
*
* Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
*
* 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.test.recipes
;
import
org.jvnet.hudson.test.HudsonTestCase
;
import
org.jvnet.hudson.test.JenkinsRecipe
;
import
org.jvnet.hudson.test.JenkinsRule
;
import
org.apache.commons.io.FileUtils
;
import
hudson.util.JenkinsReloadFailed
;
import
java.io.File
;
import
java.lang.annotation.Documented
;
import
static
java
.
lang
.
annotation
.
ElementType
.
METHOD
;
import
java.lang.annotation.Retention
;
import
static
java
.
lang
.
annotation
.
RetentionPolicy
.
RUNTIME
;
import
java.lang.annotation.Target
;
import
java.net.URL
;
/**
* Times out the test after the specified number of seconds.
*
* All the tests time out after some number of seconds by default, but this recipe
* allows you to override that value.
*
* @author Kohsuke Kawaguchi
*/
@Documented
@Recipe
(
WithTimeout
.
RunnerImpl
.
class
)
@JenkinsRecipe
(
WithTimeout
.
RuleRunnerImpl
.
class
)
@Target
(
METHOD
)
@Retention
(
RUNTIME
)
public
@interface
WithTimeout
{
/**
* Number of seconds.
*
* 0 to indicate the test should never time out.
*/
int
value
();
class
RunnerImpl
extends
Recipe
.
Runner
<
WithTimeout
>
{
@Override
public
void
setup
(
HudsonTestCase
testCase
,
WithTimeout
recipe
)
throws
Exception
{
testCase
.
timeout
=
recipe
.
value
();
}
}
class
RuleRunnerImpl
extends
JenkinsRecipe
.
Runner
<
WithTimeout
>
{
@Override
public
void
setup
(
JenkinsRule
jenkinsRule
,
WithTimeout
recipe
)
throws
Exception
{
jenkinsRule
.
timeout
=
recipe
.
value
();
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录