Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
ef4d1553
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,发现更多精彩内容 >>
提交
ef4d1553
编写于
3月 02, 2015
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-27178] Amended merge of #1590.
(cherry picked from commit
87ab95e7
)
上级
121f3bce
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
3 deletion
+21
-3
changelog.html
changelog.html
+3
-0
core/src/main/java/hudson/model/Computer.java
core/src/main/java/hudson/model/Computer.java
+3
-3
test/src/test/java/hudson/model/NodeTest.java
test/src/test/java/hudson/model/NodeTest.java
+15
-0
未找到文件。
changelog.html
浏览文件 @
ef4d1553
...
...
@@ -63,6 +63,9 @@ Upcoming changes</a>
<div
id=
"rc"
style=
"display:none;"
>
<!--=BEGIN=-->
<h3><a
name=
v1.601
>
What's new in 1.601
</a>
<!--=DATE=-->
</h3>
<ul
class=
image
>
<li
class=
"major bug"
>
Regression with environment variables in 1.600.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-27188"
>
issue 27188
</a>
)
<li
class=
bug
>
Errors in Dashboard View plugin since 1.597.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-26690"
>
issue 26690
</a>
)
...
...
core/src/main/java/hudson/model/Computer.java
浏览文件 @
ef4d1553
...
...
@@ -942,18 +942,18 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
}
/**
*
Gets the environment variables of
the JVM on this computer.
*
Returns cached environment variables (copy to prevent modification) for
the JVM on this computer.
* If this is the master, it returns the system property of the master computer.
*/
public
EnvVars
getEnvironment
()
throws
IOException
,
InterruptedException
{
EnvVars
cachedEnvironment
=
this
.
cachedEnvironment
;
if
(
cachedEnvironment
!=
null
)
{
return
cachedEnvironment
;
return
new
EnvVars
(
cachedEnvironment
)
;
}
cachedEnvironment
=
EnvVars
.
getRemote
(
getChannel
());
this
.
cachedEnvironment
=
cachedEnvironment
;
return
cachedEnvironment
;
return
new
EnvVars
(
cachedEnvironment
)
;
}
/**
...
...
test/src/test/java/hudson/model/NodeTest.java
浏览文件 @
ef4d1553
...
...
@@ -23,6 +23,7 @@
*/
package
hudson.model
;
import
hudson.EnvVars
;
import
hudson.FilePath
;
import
hudson.model.Node.Mode
;
import
hudson.model.Queue.WaitingItem
;
...
...
@@ -52,6 +53,7 @@ import static org.junit.Assert.*;
import
org.junit.Before
;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.jvnet.hudson.test.Issue
;
import
org.jvnet.hudson.test.JenkinsRule
;
import
org.jvnet.hudson.test.MockQueueItemAuthenticator
;
import
org.jvnet.hudson.test.TestExtension
;
...
...
@@ -238,6 +240,19 @@ public class NodeTest {
assertNotNull
(
"Slave which is added into Jenkins list nodes should have assigned computer."
,
slave
.
toComputer
());
}
@Issue
(
"JENKINS-27188"
)
@Test
public
void
envPropertiesImmutable
()
throws
Exception
{
Slave
slave
=
j
.
createSlave
();
String
propertyKey
=
"JENKINS-27188"
;
EnvVars
envVars
=
slave
.
getComputer
().
getEnvironment
();
envVars
.
put
(
propertyKey
,
"huuhaa"
);
assertTrue
(
envVars
.
containsKey
(
propertyKey
));
assertFalse
(
slave
.
getComputer
().
getEnvironment
().
containsKey
(
propertyKey
));
assertNotSame
(
slave
.
getComputer
().
getEnvironment
(),
slave
.
getComputer
().
getEnvironment
());
}
@TestExtension
public
static
class
LabelFinderImpl
extends
LabelFinder
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录