Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
056b4464
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,发现更多精彩内容 >>
提交
056b4464
编写于
1月 21, 2015
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-26519] Accept Windows text file quasi-symlinks for build numbers.
上级
876d492b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
2 deletion
+19
-2
changelog.html
changelog.html
+3
-0
core/src/main/java/jenkins/model/RunIdMigrator.java
core/src/main/java/jenkins/model/RunIdMigrator.java
+3
-1
core/src/test/java/jenkins/model/RunIdMigratorTest.java
core/src/test/java/jenkins/model/RunIdMigratorTest.java
+13
-1
未找到文件。
changelog.html
浏览文件 @
056b4464
...
@@ -63,6 +63,9 @@ Upcoming changes</a>
...
@@ -63,6 +63,9 @@ Upcoming changes</a>
<div
id=
"rc"
style=
"display:none;"
>
<!--=BEGIN=-->
<div
id=
"rc"
style=
"display:none;"
>
<!--=BEGIN=-->
<h3><a
name=
v1.598
>
What's new in 1.598
</a>
<!--=DATE=-->
</h3>
<h3><a
name=
v1.598
>
What's new in 1.598
</a>
<!--=DATE=-->
</h3>
<ul
class=
image
>
<ul
class=
image
>
<li
class=
'major bug'
>
Build format change migrator in 1.597 did not work on some Windows systems.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-26519"
>
issue 26519
</a>
)
<li
class=
bug
>
<li
class=
bug
>
FutureImpl does not cancel its start future.
FutureImpl does not cancel its start future.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-25514"
>
issue 25514
</a>
)
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-25514"
>
issue 25514
</a>
)
...
...
core/src/main/java/jenkins/model/RunIdMigrator.java
浏览文件 @
056b4464
...
@@ -199,7 +199,9 @@ public final class RunIdMigrator {
...
@@ -199,7 +199,9 @@ public final class RunIdMigrator {
String
name
=
kid
.
getName
();
String
name
=
kid
.
getName
();
try
{
try
{
String
link
=
Util
.
resolveSymlink
(
kid
);
String
link
=
Util
.
resolveSymlink
(
kid
);
if
(
link
==
null
)
{
if
(
link
==
null
&&
name
.
matches
(
"\\d+"
)
&&
kid
.
isFile
())
{
// legacy Windows format
link
=
FileUtils
.
readFileToString
(
kid
);
}
else
if
(
link
==
null
)
{
continue
;
continue
;
}
}
try
{
try
{
...
...
core/src/test/java/jenkins/model/RunIdMigratorTest.java
浏览文件 @
056b4464
...
@@ -28,7 +28,6 @@ import hudson.Util;
...
@@ -28,7 +28,6 @@ import hudson.Util;
import
hudson.util.StreamTaskListener
;
import
hudson.util.StreamTaskListener
;
import
java.io.File
;
import
java.io.File
;
import
java.nio.charset.Charset
;
import
java.nio.charset.Charset
;
import
java.util.Date
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.TimeZone
;
import
java.util.TimeZone
;
import
java.util.TreeMap
;
import
java.util.TreeMap
;
...
@@ -42,6 +41,7 @@ import org.junit.Before;
...
@@ -42,6 +41,7 @@ import org.junit.Before;
import
org.junit.BeforeClass
;
import
org.junit.BeforeClass
;
import
org.junit.Rule
;
import
org.junit.Rule
;
import
org.junit.rules.TemporaryFolder
;
import
org.junit.rules.TemporaryFolder
;
import
org.jvnet.hudson.test.Issue
;
public
class
RunIdMigratorTest
{
public
class
RunIdMigratorTest
{
...
@@ -117,6 +117,18 @@ public class RunIdMigratorTest {
...
@@ -117,6 +117,18 @@ public class RunIdMigratorTest {
assertEquals
(
"{1=→2014-01-02_03-04-05, 2014-01-02_03-04-05={build.xml='<?xml version='1.0' encoding='UTF-8'?>\n<run>\n <stuff>ok</stuff>\n <number>1</number>\n <otherstuff>ok</otherstuff>\n</run>'}}"
,
summarize
());
assertEquals
(
"{1=→2014-01-02_03-04-05, 2014-01-02_03-04-05={build.xml='<?xml version='1.0' encoding='UTF-8'?>\n<run>\n <stuff>ok</stuff>\n <number>1</number>\n <otherstuff>ok</otherstuff>\n</run>'}}"
,
summarize
());
}
}
@Issue
(
"JENKINS-26519"
)
@Test
public
void
windowsQuasiLinks
()
throws
Exception
{
write
(
"2014-01-02_03-04-05/build.xml"
,
"<?xml version='1.0' encoding='UTF-8'?>\n<run>\n <stuff>ok</stuff>\n <number>99</number>\n <otherstuff>ok</otherstuff>\n</run>"
);
write
(
"99"
,
"2014-01-02_03-04-05"
);
write
(
"lastFailedBuild"
,
"-1"
);
write
(
"lastSuccessfulBuild"
,
"99"
);
assertEquals
(
"{2014-01-02_03-04-05={build.xml='<?xml version='1.0' encoding='UTF-8'?>\n<run>\n <stuff>ok</stuff>\n <number>99</number>\n <otherstuff>ok</otherstuff>\n</run>'}, 99='2014-01-02_03-04-05', lastFailedBuild='-1', lastSuccessfulBuild='99'}"
,
summarize
());
assertTrue
(
migrator
.
migrate
(
dir
,
null
));
assertEquals
(
"{99={build.xml='<?xml version='1.0' encoding='UTF-8'?>\n<run>\n <stuff>ok</stuff>\n <id>2014-01-02_03-04-05</id>\n <timestamp>1388649845000</timestamp>\n <otherstuff>ok</otherstuff>\n</run>'}, lastFailedBuild='-1', lastSuccessfulBuild='99', legacyIds='2014-01-02_03-04-05 99\n'}"
,
summarize
());
assertEquals
(
99
,
migrator
.
findNumber
(
"2014-01-02_03-04-05"
));
}
// TODO test sane recovery from various error conditions
// TODO test sane recovery from various error conditions
private
void
write
(
String
file
,
String
text
)
throws
Exception
{
private
void
write
(
String
file
,
String
text
)
throws
Exception
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录