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

config log for screen, result and trace levels

上级 af9157ee
...@@ -52,7 +52,7 @@ func ValidateCaseResult(scriptFile string, langType string, ...@@ -52,7 +52,7 @@ func ValidateCaseResult(scriptFile string, langType string,
stepId, _ := strconv.Atoi(str) stepId, _ := strconv.Atoi(str)
stepResult, checkpointLogs := ValidateStepResult(langType, expectLines, actualLines) stepResult, checkpointLogs := ValidateStepResult(langType, expectLines, actualLines)
stepLog := model.StepLog{Id: stepId, Name: step, Status: stepResult, CheckPoints: checkpointLogs} stepLog := model.StepLog{Id: stepId, Name: arr[1], Status: stepResult, CheckPoints: checkpointLogs}
stepLogs = append(stepLogs, stepLog) stepLogs = append(stepLogs, stepLog)
if !stepResult { if !stepResult {
caseResult = constant.FAIL.String() caseResult = constant.FAIL.String()
......
...@@ -4,7 +4,6 @@ import ( ...@@ -4,7 +4,6 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/easysoft/zentaoatf/src/model" "github.com/easysoft/zentaoatf/src/model"
"github.com/easysoft/zentaoatf/src/utils/common"
constant "github.com/easysoft/zentaoatf/src/utils/const" constant "github.com/easysoft/zentaoatf/src/utils/const"
"github.com/easysoft/zentaoatf/src/utils/file" "github.com/easysoft/zentaoatf/src/utils/file"
i118Utils "github.com/easysoft/zentaoatf/src/utils/i118" i118Utils "github.com/easysoft/zentaoatf/src/utils/i118"
...@@ -29,7 +28,7 @@ func Print(report model.TestReport) { ...@@ -29,7 +28,7 @@ func Print(report model.TestReport) {
logUtils.PrintAndLogColorLn(fmt.Sprintf(" %s: %d", i118Utils.I118Prt.Sprintf("skip"), report.Skip), color.FgYellow) logUtils.PrintAndLogColorLn(fmt.Sprintf(" %s: %d", i118Utils.I118Prt.Sprintf("skip"), report.Skip), color.FgYellow)
for _, cs := range report.Cases { for _, cs := range report.Cases {
str := "\n %d. %s %s, %s" str := "\n%d. %s %s, %s"
status := cs.Status status := cs.Status
statusColor := logUtils.ColoredStatus(status) statusColor := logUtils.ColoredStatus(status)
...@@ -43,12 +42,12 @@ func Print(report model.TestReport) { ...@@ -43,12 +42,12 @@ func Print(report model.TestReport) {
logUtils.PrintAndLog("") logUtils.PrintAndLog("")
} }
str := " %s: %s" str := "[Step%d]: %s \n"
status := commonUtils.BoolToPass(step.Status) //status := commonUtils.BoolToPass(step.Status)
statusColor := logUtils.ColoredStatus(status) //statusColor := logUtils.ColoredStatus(status)
//logs = append(logs, fmt.Sprintf(str, status, step.Name)) //logs = append(logs, fmt.Sprintf(str, status, step.Name))
logUtils.PrintTo(fmt.Sprintf(str, statusColor, step.Name+"\n")) logUtils.PrintTo(fmt.Sprintf(str, step.Id, step.Name))
count1 := 0 count1 := 0
for _, cp := range step.CheckPoints { for _, cp := range step.CheckPoints {
...@@ -62,8 +61,8 @@ func Print(report model.TestReport) { ...@@ -62,8 +61,8 @@ func Print(report model.TestReport) {
// i118Utils.I118Prt.Sprintf("checkpoint"), cp.Numb)) // i118Utils.I118Prt.Sprintf("checkpoint"), cp.Numb))
//logUtils.PrintTo(fmt.Sprintf(" %s: %s %d\n", cpStatusColored, i118Utils.I118Prt.Sprintf("checkpoint"), cp.Numb)) //logUtils.PrintTo(fmt.Sprintf(" %s: %s %d\n", cpStatusColored, i118Utils.I118Prt.Sprintf("checkpoint"), cp.Numb))
logUtils.PrintAndLog(fmt.Sprintf(" %s %s", i118Utils.I118Prt.Sprintf("expect_result"), cp.Expect)) logUtils.PrintAndLog(fmt.Sprintf("[Expect] %s", cp.Expect))
logUtils.PrintAndLog(fmt.Sprintf(" %s %s", i118Utils.I118Prt.Sprintf("actual_result"), cp.Actual)) logUtils.PrintAndLog(fmt.Sprintf("[Actual] %s", cp.Actual))
count1++ count1++
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册