Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
a52d6651
J
jenkins
项目概览
LinuxSuRen
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
a52d6651
编写于
3月 31, 2015
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-27392] SimpleBuildWrapper.createLoggerDecorator
上级
11ac075d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
62 addition
and
5 deletion
+62
-5
core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java
core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java
+13
-5
test/src/test/java/jenkins/tasks/SimpleBuildWrapperTest.java
test/src/test/java/jenkins/tasks/SimpleBuildWrapperTest.java
+49
-0
未找到文件。
core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java
浏览文件 @
a52d6651
...
...
@@ -28,6 +28,7 @@ import hudson.AbortException;
import
hudson.EnvVars
;
import
hudson.FilePath
;
import
hudson.Launcher
;
import
hudson.console.ConsoleLogFilter
;
import
hudson.model.AbstractBuild
;
import
hudson.model.AbstractProject
;
import
hudson.model.Action
;
...
...
@@ -177,12 +178,19 @@ public abstract class SimpleBuildWrapper extends BuildWrapper {
}
}
/**
* Allows this wrapper to decorate log output.
* @param build as is passed to {@link #setUp(Context, Run, FilePath, Launcher, TaskListener, EnvVars)}
* @return a filter which ignores its {@code build} parameter and is {@link Serializable}; or null (the default)
* @since 1.608
*/
public
@CheckForNull
ConsoleLogFilter
createLoggerDecorator
(
@Nonnull
Run
<?,?>
build
)
{
return
null
;
}
@Override
public
final
OutputStream
decorateLogger
(
AbstractBuild
build
,
OutputStream
logger
)
throws
IOException
,
InterruptedException
,
Run
.
RunnerAbortedException
{
// Doubtful this can be supported.
// Decorating a TaskListener would be more reasonable.
// But for an AbstractBuild this is called early in Run.execute, before setUp.
// And for other kinds of builds, it is unclear what this would even mean.
return
logger
;
ConsoleLogFilter
filter
=
createLoggerDecorator
(
build
);
return
filter
!=
null
?
filter
.
decorateLogger
(
build
,
logger
)
:
logger
;
}
@Override
public
final
Launcher
decorateLauncher
(
AbstractBuild
build
,
Launcher
launcher
,
BuildListener
listener
)
throws
IOException
,
InterruptedException
,
Run
.
RunnerAbortedException
{
...
...
test/src/test/java/jenkins/tasks/SimpleBuildWrapperTest.java
浏览文件 @
a52d6651
...
...
@@ -28,7 +28,11 @@ import hudson.EnvVars;
import
hudson.FilePath
;
import
hudson.Functions
;
import
hudson.Launcher
;
import
hudson.console.ConsoleLogFilter
;
import
hudson.console.LineTransformationOutputStream
;
import
hudson.model.AbstractBuild
;
import
hudson.model.AbstractProject
;
import
hudson.model.BuildListener
;
import
hudson.model.Computer
;
import
hudson.model.Descriptor
;
import
hudson.model.FreeStyleBuild
;
...
...
@@ -45,18 +49,26 @@ import hudson.tasks.BuildWrapperDescriptor;
import
hudson.tasks.Shell
;
import
java.io.File
;
import
java.io.IOException
;
import
java.io.OutputStream
;
import
java.io.Serializable
;
import
java.util.Collections
;
import
java.util.Locale
;
import
org.junit.Test
;
import
static
org
.
junit
.
Assert
.*;
import
org.junit.Assume
;
import
org.junit.ClassRule
;
import
org.junit.Rule
;
import
org.junit.rules.TemporaryFolder
;
import
org.jvnet.hudson.test.BuildWatcher
;
import
org.jvnet.hudson.test.CaptureEnvironmentBuilder
;
import
org.jvnet.hudson.test.Issue
;
import
org.jvnet.hudson.test.JenkinsRule
;
import
org.jvnet.hudson.test.TestBuilder
;
import
org.jvnet.hudson.test.TestExtension
;
public
class
SimpleBuildWrapperTest
{
@ClassRule
public
static
BuildWatcher
buildWatcher
=
new
BuildWatcher
();
@Rule
public
JenkinsRule
r
=
new
JenkinsRule
();
@Rule
public
TemporaryFolder
tmp
=
new
TemporaryFolder
();
...
...
@@ -162,7 +174,44 @@ public class SimpleBuildWrapperTest {
return
true
;
}
}
}
@Issue
(
"JENKINS-27392"
)
@Test
public
void
loggerDecorator
()
throws
Exception
{
FreeStyleProject
p
=
r
.
createFreeStyleProject
();
p
.
getBuildWrappersList
().
add
(
new
WrapperWithLogger
());
p
.
getBuildersList
().
add
(
new
TestBuilder
()
{
@Override
public
boolean
perform
(
AbstractBuild
<?,?>
build
,
Launcher
launcher
,
BuildListener
listener
)
throws
InterruptedException
,
IOException
{
listener
.
getLogger
().
println
(
"sending a message"
);
return
true
;
}
});
r
.
assertLogContains
(
"SENDING A MESSAGE"
,
r
.
buildAndAssertSuccess
(
p
));
}
public
static
class
WrapperWithLogger
extends
SimpleBuildWrapper
{
@Override
public
void
setUp
(
Context
context
,
Run
<?,?>
build
,
FilePath
workspace
,
Launcher
launcher
,
TaskListener
listener
,
EnvVars
initialEnvironment
)
throws
IOException
,
InterruptedException
{}
@Override
public
ConsoleLogFilter
createLoggerDecorator
(
Run
<?,?>
build
)
{
return
new
UpcaseFilter
();
}
private
static
class
UpcaseFilter
extends
ConsoleLogFilter
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1
;
@SuppressWarnings
(
"rawtypes"
)
// inherited
@Override
public
OutputStream
decorateLogger
(
AbstractBuild
_ignore
,
final
OutputStream
logger
)
throws
IOException
,
InterruptedException
{
return
new
LineTransformationOutputStream
()
{
@Override
protected
void
eol
(
byte
[]
b
,
int
len
)
throws
IOException
{
logger
.
write
(
new
String
(
b
,
0
,
len
).
toUpperCase
(
Locale
.
ROOT
).
getBytes
());
}
};
}
}
@TestExtension
(
"loggerDecorator"
)
public
static
class
DescriptorImpl
extends
BuildWrapperDescriptor
{
@Override
public
String
getDisplayName
()
{
return
"WrapperWithLogger"
;
}
@Override
public
boolean
isApplicable
(
AbstractProject
<?,?>
item
)
{
return
true
;
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录