Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
易企天创
zentaoatf
提交
19f6ade8
Z
zentaoatf
项目概览
易企天创
/
zentaoatf
12 个月 前同步成功
通知
11
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
3
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Z
zentaoatf
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
3
Issue
3
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
19f6ade8
编写于
2月 25, 2022
作者:
aaronchen2k2k
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ignore detail log if running with cmd line
上级
55505166
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
18 addition
and
14 deletion
+18
-14
internal/comm/helper/exec/report-unit.go
internal/comm/helper/exec/report-unit.go
+5
-3
internal/comm/helper/exec/ztf.go
internal/comm/helper/exec/ztf.go
+9
-7
ui/src/views/exec/exec/module.vue
ui/src/views/exec/exec/module.vue
+1
-1
ui/src/views/exec/exec/suite.vue
ui/src/views/exec/exec/suite.vue
+1
-1
ui/src/views/exec/exec/task.vue
ui/src/views/exec/exec/task.vue
+1
-1
ui/src/views/exec/exec/unit.vue
ui/src/views/exec/exec/unit.vue
+1
-1
未找到文件。
internal/comm/helper/exec/report-unit.go
浏览文件 @
19f6ade8
...
...
@@ -44,6 +44,8 @@ func GenUnitTestReport(req serverDomain.WsReq, startTime, endTime int64,
TestType
:
commConsts
.
TestUnit
,
TestTool
:
req
.
TestTool
,
BuildTool
:
req
.
BuildTool
,
StartTime
:
startTime
,
EndTime
:
endTime
,
Pass
:
0
,
Fail
:
0
,
Total
:
0
}
failedCount
:=
0
...
...
@@ -70,9 +72,9 @@ func GenUnitTestReport(req serverDomain.WsReq, startTime, endTime int64,
}
report
.
Total
++
if
cs
.
StartTime
<
report
.
StartTime
{
report
.
StartTime
=
cs
.
StartTime
}
//
if cs.StartTime < report.StartTime {
//
report.StartTime = cs.StartTime
//
}
if
cs
.
EndTime
>
report
.
EndTime
{
report
.
EndTime
=
cs
.
EndTime
}
...
...
internal/comm/helper/exec/ztf.go
浏览文件 @
19f6ade8
...
...
@@ -164,9 +164,9 @@ func ExeScript(scriptFile, projectPath string, conf commDomain.ProjectConf, repo
if
commConsts
.
ComeFrom
!=
"cmd"
{
websocketUtils
.
SendExecMsg
(
startMsg
,
""
,
wsMsg
)
logUtils
.
ExecConsolef
(
-
1
,
startMsg
)
}
logUtils
.
ExecConsolef
(
-
1
,
startMsg
)
logUtils
.
ExecFilef
(
startMsg
)
logs
:=
""
...
...
@@ -190,16 +190,16 @@ func ExeScript(scriptFile, projectPath string, conf commDomain.ProjectConf, repo
endMsg
:=
i118Utils
.
Sprintf
(
"end_execution"
,
scriptFile
,
dateUtils
.
DateTimeStr
(
entTime
))
if
commConsts
.
ComeFrom
!=
"cmd"
{
websocketUtils
.
SendExecMsg
(
endMsg
,
""
,
wsMsg
)
logUtils
.
ExecConsolef
(
-
1
,
endMsg
)
}
logUtils
.
ExecConsolef
(
-
1
,
endMsg
)
logUtils
.
ExecFilef
(
endMsg
)
CheckCaseResult
(
scriptFile
,
logs
,
report
,
idx
,
total
,
secs
,
pathMaxWidth
,
numbMaxWidth
,
wsMsg
)
if
idx
<
total
-
1
{
logUtils
.
Infof
(
""
)
}
//
if idx < total-1 {
//
logUtils.Infof("")
//
}
}
func
RunScript
(
filePath
,
projectPath
string
,
conf
commDomain
.
ProjectConf
,
...
...
@@ -251,8 +251,9 @@ func RunScript(filePath, projectPath string, conf commDomain.ProjectConf,
msgStr
:=
i118Utils
.
Sprintf
(
"cmd_empty"
)
if
commConsts
.
ComeFrom
!=
"cmd"
{
websocketUtils
.
SendOutputMsg
(
msgStr
,
""
,
wsMsg
)
logUtils
.
ExecConsolef
(
color
.
FgRed
,
msgStr
)
}
logUtils
.
ExecConsolef
(
color
.
FgRed
,
msgStr
)
logUtils
.
ExecFilef
(
msgStr
)
return
""
,
msgStr
...
...
@@ -290,8 +291,9 @@ func RunScript(filePath, projectPath string, conf commDomain.ProjectConf,
if
commConsts
.
ComeFrom
!=
"cmd"
{
websocketUtils
.
SendOutputMsg
(
line
,
""
,
wsMsg
)
logUtils
.
ExecConsole
(
1
,
line
)
}
logUtils
.
ExecConsole
(
1
,
line
)
logUtils
.
ExecFile
(
line
)
isTerminal
=
true
...
...
ui/src/views/exec/exec/module.vue
浏览文件 @
19f6ade8
...
...
@@ -140,7 +140,7 @@ export default defineComponent({
if
(
error
.
response
.
data
.
code
===
2000
)
router
.
push
(
`/config`
)
})
}
//
fetchProducts()
fetchProducts
()
watch
(
currConfig
,
()
=>
{
fetchProducts
()
})
...
...
ui/src/views/exec/exec/suite.vue
浏览文件 @
19f6ade8
...
...
@@ -140,7 +140,7 @@ export default defineComponent({
if
(
error
.
response
.
data
.
code
===
2000
)
router
.
push
(
`/config`
)
})
}
//
fetchProducts()
fetchProducts
()
watch
(
currConfig
,
()
=>
{
fetchProducts
()
})
...
...
ui/src/views/exec/exec/task.vue
浏览文件 @
19f6ade8
...
...
@@ -139,7 +139,7 @@ export default defineComponent({
if
(
error
.
response
.
data
.
code
===
2000
)
router
.
push
(
`/config`
)
})
}
//
fetchProducts()
fetchProducts
()
watch
(
currConfig
,
()
=>
{
fetchProducts
()
})
...
...
ui/src/views/exec/exec/unit.vue
浏览文件 @
19f6ade8
...
...
@@ -148,7 +148,7 @@ export default defineComponent({
if
(
error
.
response
.
data
.
code
===
2000
)
router
.
push
(
`/config`
)
})
}
//
fetchProducts()
fetchProducts
()
watch
(
currConfig
,
()
=>
{
fetchProducts
()
})
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录