Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
7bb61a24
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,发现更多精彩内容 >>
提交
7bb61a24
编写于
3月 30, 2015
作者:
R
Richard Mortimer
浏览文件
操作
浏览文件
下载
差异文件
Merge fix for 'JENKINS-26777'
上级
37964df0
c2c9a3ef
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
23 addition
and
3 deletion
+23
-3
changelog.html
changelog.html
+3
-0
core/src/main/java/hudson/model/Run.java
core/src/main/java/hudson/model/Run.java
+4
-1
core/src/main/resources/hudson/model/Messages.properties
core/src/main/resources/hudson/model/Messages.properties
+1
-0
core/src/test/java/hudson/model/RunTest.java
core/src/test/java/hudson/model/RunTest.java
+15
-2
未找到文件。
changelog.html
浏览文件 @
7bb61a24
...
...
@@ -94,6 +94,9 @@ Upcoming changes</a>
<li
class=
bug
>
Ensure that the LoadStatistics return a self-consistent result.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-21618"
>
issue 21618
</a>
)
<li
class=
bug
>
Build reports to be running for 45 yr and counting.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-26777"
>
issue 26777
</a>
)
</ul>
</div>
<!--=TRUNK-END=-->
<h3><a
name=
v1.606
>
What's new in 1.606
</a>
(2015/03/23)
</h3>
...
...
core/src/main/java/hudson/model/Run.java
浏览文件 @
7bb61a24
...
...
@@ -717,9 +717,12 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
* Gets the string that says how long the build took to run.
*/
public
@Nonnull
String
getDurationString
()
{
if
(
isBuilding
())
if
(
hasntStartedYet
())
{
return
Messages
.
Run_NotStartedYet
();
}
else
if
(
isBuilding
())
{
return
Messages
.
Run_InProgressDuration
(
Util
.
getTimeSpanString
(
System
.
currentTimeMillis
()-
startTime
));
}
return
Util
.
getTimeSpanString
(
duration
);
}
...
...
core/src/main/resources/hudson/model/Messages.properties
浏览文件 @
7bb61a24
...
...
@@ -225,6 +225,7 @@ Run.ArtifactsPermission.Description=\
builds. If you don
\u2019
t want an user to access the artifacts, you can do so by
\
revoking this permission.
Run.InProgressDuration
=
{0} and counting
Run.NotStartedYet
=
Not started yet
Run.ArtifactsBrowserTitle
=
Artifacts of {0} {1}
Run.Summary.Stable
=
stable
...
...
core/src/test/java/hudson/model/RunTest.java
浏览文件 @
7bb61a24
...
...
@@ -24,14 +24,13 @@
package
hudson.model
;
import
hudson.model.Run.Artifact
;
import
java.io.IOException
;
import
java.util.List
;
import
java.util.TimeZone
;
import
java.util.concurrent.Callable
;
import
java.util.concurrent.ExecutorService
;
import
java.util.concurrent.Executors
;
import
static
org
.
junit
.
Assert
.*;
import
org.junit.Test
;
import
org.jvnet.hudson.test.Issue
;
...
...
@@ -115,4 +114,18 @@ public class RunTest {
assertEquals
(
a
.
get
(
1
).
getDisplayPath
(),
"a/a.xml"
);
}
@Issue
(
"JENKINS-26777"
)
@SuppressWarnings
({
"unchecked"
,
"rawtypes"
})
@Test
public
void
getDurationString
()
throws
IOException
{
Run
r
=
new
Run
(
new
StubJob
(),
0
)
{};
assertEquals
(
"Not started yet"
,
r
.
getDurationString
());
r
.
onStartBuilding
();
String
msg
;
msg
=
r
.
getDurationString
();
assertTrue
(
msg
,
msg
.
endsWith
(
" and counting"
));
r
.
onEndBuilding
();
msg
=
r
.
getDurationString
();
assertFalse
(
msg
,
msg
.
endsWith
(
" and counting"
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录