提交 19f6ade8 编写于 作者: aaronchen2k2k's avatar aaronchen2k2k

ignore detail log if running with cmd line

上级 55505166
......@@ -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
}
......
......@@ -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
......
......@@ -140,7 +140,7 @@ export default defineComponent({
if (error.response.data.code === 2000) router.push(`/config`)
})
}
// fetchProducts()
fetchProducts()
watch(currConfig, ()=> {
fetchProducts()
})
......
......@@ -140,7 +140,7 @@ export default defineComponent({
if (error.response.data.code === 2000) router.push(`/config`)
})
}
// fetchProducts()
fetchProducts()
watch(currConfig, ()=> {
fetchProducts()
})
......
......@@ -139,7 +139,7 @@ export default defineComponent({
if (error.response.data.code === 2000) router.push(`/config`)
})
}
// fetchProducts()
fetchProducts()
watch(currConfig, ()=> {
fetchProducts()
})
......
......@@ -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.
先完成此消息的编辑!
想要评论请 注册