GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-12 16:01:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-logs' into 'master'

Browse Source 
Fix logs

See merge request iesqa/httprunner!126
This commit is contained in:
李隆
2025-07-11 08:32:33 +00:00
parent 94d1bbe8b1 4c418f9183
commit e9eac121d8
2 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
runner.go
View File

@@ -878,9 +878,6 @@ func (r *SessionRunner) RunStep(step IStep) (stepResult *StepResult, err error)
} }
} }
stepName := step.Name()
stepType := string(step.Type())
// execute step with parameters iterator // execute step with parameters iterator
tasks, err := r.generateExecutionTasks(step) tasks, err := r.generateExecutionTasks(step)
if err != nil { if err != nil {
@@ -899,30 +896,10 @@ func (r *SessionRunner) RunStep(step IStep) (stepResult *StepResult, err error)
r.sessionVariables[k] = v r.sessionVariables[k] = v
} }
} }
// log final result
if err == nil && stepResult.Success {
log.Info().Str("step", stepName).
Str("type", stepType).
Bool("success", true).
Int64("elapsed(ms)", stepResult.Elapsed).
Interface("exportVars", stepResult.ExportVars).
Msg(RUN_STEP_END)
} else if stepResult != nil {
log.Error().Str("step", stepName).
Str("type", stepType).
Bool("success", false).
Int64("elapsed(ms)", stepResult.Elapsed).
Int("completed_tasks", len(stepResults)).
Int("total_tasks", len(tasks)).
Msg(RUN_STEP_END)
}
}() }()
// execute with loops as outer iteration // execute with loops as outer iteration
for _, task := range tasks { for _, task := range tasks {
log.Info().Str("step", task.stepName).Str("type", stepType).Msg(RUN_STEP_START)
// Check for interrupt signal before each parameter iteration // Check for interrupt signal before each parameter iteration
select { select {
case <-r.caseRunner.hrpRunner.interruptSignal: case <-r.caseRunner.hrpRunner.interruptSignal:
@@ -967,6 +944,24 @@ func (r *SessionRunner) RunStep(step IStep) (stepResult *StepResult, err error)
// executeStepWithVariables executes a single step with given parameters // executeStepWithVariables executes a single step with given parameters
// parameters will override step variables with the same name // parameters will override step variables with the same name
func (r *SessionRunner) executeStepWithVariables(step IStep, stepName string, parameters map[string]interface{}) (stepResult *StepResult, err error) { func (r *SessionRunner) executeStepWithVariables(step IStep, stepName string, parameters map[string]interface{}) (stepResult *StepResult, err error) {
stepType := string(step.Type())
log.Info().Str("step", stepName).Str("type", stepType).Msg(RUN_STEP_START)
defer func() {
if err == nil && stepResult.Success {
log.Info().Str("step", stepName).
Str("type", stepType).
Bool("success", true).
Int64("elapsed(ms)", stepResult.Elapsed).
Msg(RUN_STEP_END)
} else {
log.Error().Str("step", stepName).
Str("type", stepType).
Bool("success", false).
Int64("elapsed(ms)", stepResult.Elapsed).
Msg(RUN_STEP_END)
}
}()
stepConfig := step.Config() stepConfig := step.Config()
// backup original variables // backup original variables

8
uixt/ios_driver_wda.go
View File

@@ -275,14 +275,14 @@ func (wd *WDADriver) Scale() (float64, error) {
} }
type Screen struct { type Screen struct {
StatusBarSize types.Size `json:"statusBarSize"` types.Size
Scale float64 `json:"scale"` Scale float64 `json:"scale"`
} }
func (wd *WDADriver) Screen() (screen Screen, err error) { func (wd *WDADriver) Screen() (screen Screen, err error) {
// [[FBRoute GET:@"/wda/screen"] respondWithTarget:self action:@selector(handleGetScreen:)] // [[FBRoute GET:@"/wings/window/size"] respondWithTarget:self action:@selector(handleGetScreen:)]
var rawResp DriverRawResponse var rawResp DriverRawResponse
if rawResp, err = wd.Session.GET("/wda/screen"); err != nil { if rawResp, err = wd.Session.GET("/wings/window/size"); err != nil {
return Screen{}, err return Screen{}, err
} }
reply := new(struct{ Value struct{ Screen } }) reply := new(struct{ Value struct{ Screen } })