Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
48b909db
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
48b909db
编写于
7月 09, 2015
作者:
O
Oliver Gondža
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-29300] Display system info even when slave is temporarily offline
上级
38fc3e53
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
59 addition
and
4 deletion
+59
-4
core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo.jelly
...in/resources/hudson/slaves/SlaveComputer/systemInfo.jelly
+2
-2
test/src/test/java/hudson/cli/ComputerStateTest.java
test/src/test/java/hudson/cli/ComputerStateTest.java
+57
-2
未找到文件。
core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo.jelly
浏览文件 @
48b909db
...
...
@@ -44,7 +44,7 @@ THE SOFTWARE.
<l:hasPermission permission="${it.CONNECT}">
<j:choose>
<j:when test="${it.
online
}">
<j:when test="${it.
channel != null
}">
<h2>${it.oSDescription} slave, version ${it.slaveVersion}</h2>
<j:forEach var="instance" items="${it.systemInfoExtensions}">
...
...
@@ -59,4 +59,4 @@ THE SOFTWARE.
</l:hasPermission>
</l:main-panel>
</l:layout>
</j:jelly>
\ No newline at end of file
</j:jelly>
test/src/test/java/hudson/cli/ComputerStateTest.java
浏览文件 @
48b909db
...
...
@@ -25,19 +25,27 @@ package hudson.cli;
import
static
org
.
junit
.
Assert
.*;
import
static
hudson
.
cli
.
CLICommandInvoker
.
Matcher
.*;
import
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
hamcrest
.
Matchers
.
empty
;
import
static
org
.
hamcrest
.
Matchers
.
endsWith
;
import
static
org
.
hamcrest
.
Matchers
.
equalTo
;
import
static
org
.
hamcrest
.
Matchers
.
not
;
import
jenkins.model.Jenkins
;
import
hudson.cli.CLICommandInvoker.Result
;
import
hudson.model.Computer
;
import
hudson.model.Slave
;
import
hudson.model.User
;
import
hudson.security.ACL
;
import
hudson.slaves.DumbSlave
;
import
hudson.slaves.OfflineCause.UserCause
;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.jvnet.hudson.test.JenkinsRule
;
import
org.jvnet.hudson.test.JenkinsRule.WebClient
;
import
com.gargoylesoftware.htmlunit.ElementNotFoundException
;
import
com.gargoylesoftware.htmlunit.html.HtmlPage
;
/**
* @author ogondza
...
...
@@ -115,4 +123,51 @@ public class ComputerStateTest {
assertThat
(
cause
.
toString
(),
endsWith
(
"Custom cause message"
));
assertThat
(
cause
.
getUser
(),
equalTo
(
command
.
user
()));
}
@Test
public
void
testUiForConnected
()
throws
Exception
{
DumbSlave
slave
=
j
.
createOnlineSlave
();
Computer
computer
=
slave
.
toComputer
();
WebClient
wc
=
j
.
createWebClient
();
assertConnected
(
wc
,
slave
);
computer
.
setTemporarilyOffline
(
true
,
null
);
assertTrue
(
computer
.
isTemporarilyOffline
());
assertConnected
(
wc
,
slave
);
slave
.
toComputer
().
disconnect
(
null
);
HtmlPage
page
=
wc
.
getPage
(
slave
);
assertLinkDoesNotExist
(
page
,
"Disconnect"
);
assertLinkDoesNotExist
(
page
,
"Script Console"
);
HtmlPage
script
=
wc
.
getPage
(
slave
,
"script"
);
assertThat
(
script
.
getByXPath
(
"//form[@action='script']"
),
empty
());
assertLinkDoesNotExist
(
page
,
"System Information"
);
HtmlPage
info
=
wc
.
getPage
(
slave
,
"systemInfo"
);
assertThat
(
info
.
asText
(),
not
(
containsString
(
"Environment Variables"
)));
}
private
void
assertConnected
(
WebClient
wc
,
DumbSlave
slave
)
throws
Exception
{
HtmlPage
main
=
wc
.
getPage
(
slave
);
main
.
getAnchorByText
(
"Disconnect"
);
main
.
getAnchorByText
(
"Script Console"
);
HtmlPage
script
=
wc
.
getPage
(
slave
,
"script"
);
assertThat
(
script
.
getByXPath
(
"//form[@action='script']"
),
not
(
empty
()));
main
.
getAnchorByText
(
"System Information"
);
HtmlPage
info
=
wc
.
getPage
(
slave
,
"systemInfo"
);
assertThat
(
info
.
asText
(),
containsString
(
"Environment Variables"
));
}
private
void
assertLinkDoesNotExist
(
HtmlPage
page
,
String
text
)
{
try
{
page
.
getAnchorByText
(
text
);
fail
(
text
+
" link should not exist"
);
}
catch
(
ElementNotFoundException
_
)
{
/*expected*/
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录