mirror of
https://github.com/httprunner/httprunner.git
synced 2026-06-06 00:09:37 +08:00
release v4.3.0
This commit is contained in:
@@ -251,13 +251,19 @@ func LoadFile(path string, structObj interface{}) (err error) {
|
||||
decoder := json.NewDecoder(bytes.NewReader(file))
|
||||
decoder.UseNumber()
|
||||
err = decoder.Decode(structObj)
|
||||
err = errors.Wrap(code.LoadJSONError, err.Error())
|
||||
if err != nil {
|
||||
err = errors.Wrap(code.LoadJSONError, err.Error())
|
||||
}
|
||||
case ".yaml", ".yml":
|
||||
err = yaml.Unmarshal(file, structObj)
|
||||
err = errors.Wrap(code.LoadYAMLError, err.Error())
|
||||
if err != nil {
|
||||
err = errors.Wrap(code.LoadYAMLError, err.Error())
|
||||
}
|
||||
case ".env":
|
||||
err = parseEnvContent(file, structObj)
|
||||
err = errors.Wrap(code.LoadEnvError, err.Error())
|
||||
if err != nil {
|
||||
err = errors.Wrap(code.LoadEnvError, err.Error())
|
||||
}
|
||||
default:
|
||||
err = code.UnsupportedFileExtension
|
||||
}
|
||||
|
||||
@@ -134,6 +134,11 @@ var errorsMap = map[error]int{
|
||||
OCRTextNotFoundError: 84,
|
||||
}
|
||||
|
||||
func IsErrorPredefined(err error) bool {
|
||||
_, ok := errorsMap[err]
|
||||
return ok
|
||||
}
|
||||
|
||||
func GetErrorCode(err error) (exitCode int) {
|
||||
if err == nil {
|
||||
return Success
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# NOTE: Generated By hrp v4.2.0, DO NOT EDIT!
|
||||
# NOTE: Generated By hrp v4.3.0, DO NOT EDIT!
|
||||
|
||||
import sys
|
||||
import os
|
||||
@@ -10,6 +10,7 @@ from debugtalk import *
|
||||
|
||||
if __name__ == "__main__":
|
||||
import funppy
|
||||
|
||||
funppy.register("get_user_agent", get_user_agent)
|
||||
funppy.register("sleep", sleep)
|
||||
funppy.register("sum", sum)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// NOTE: Generated By hrp v4.3.0-beta-10172144, DO NOT EDIT!
|
||||
// NOTE: Generated By hrp v4.3.0, DO NOT EDIT!
|
||||
package main
|
||||
|
||||
import (
|
||||
|
||||
@@ -1 +1 @@
|
||||
v4.3.0-beta-10211541
|
||||
v4.3.0
|
||||
@@ -53,8 +53,7 @@ func LoadTestCases(iTestCases ...ITestCase) ([]*TestCase, error) {
|
||||
testCasePath := TestCasePath(path)
|
||||
tc, err := testCasePath.ToTestCase()
|
||||
if err != nil {
|
||||
log.Warn().Err(err).Str("path", path).Msg("load testcase failed")
|
||||
return err
|
||||
return nil
|
||||
}
|
||||
testCases = append(testCases, tc)
|
||||
return nil
|
||||
|
||||
@@ -84,7 +84,7 @@ func (dExt *DriverExt) SwipeUntil(direction interface{}, findCondition Action, f
|
||||
}
|
||||
} else if d, ok := direction.([]float64); ok {
|
||||
if err := dExt.SwipeRelative(d[0], d[1], d[2], d[3]); err != nil {
|
||||
log.Error().Err(err).Msgf("swipe %s failed", d)
|
||||
log.Error().Err(err).Msgf("swipe %v failed", d)
|
||||
}
|
||||
} else if d, ok := direction.([]interface{}); ok {
|
||||
sx, _ := builtin.Interface2Float64(d[0])
|
||||
|
||||
@@ -614,7 +614,10 @@ func runStepMobileUI(s *SessionRunner, step *TStep) (stepResult *StepResult, err
|
||||
fmt.Sprintf("parse action params failed: %v", err))
|
||||
}
|
||||
if err := uiDriver.DoAction(action); err != nil {
|
||||
return stepResult, errors.Wrap(code.MobileUIDriverError, err.Error())
|
||||
if !code.IsErrorPredefined(err) {
|
||||
err = errors.Wrap(code.MobileUIDriverError, err.Error())
|
||||
}
|
||||
return stepResult, err
|
||||
}
|
||||
}
|
||||
|
||||
@@ -631,7 +634,9 @@ func runStepMobileUI(s *SessionRunner, step *TStep) (stepResult *StepResult, err
|
||||
// validate
|
||||
validateResults, err := validateUI(uiDriver, step.Validators)
|
||||
if err != nil {
|
||||
err = errors.Wrap(code.MobileUIValidationError, err.Error())
|
||||
if !code.IsErrorPredefined(err) {
|
||||
err = errors.Wrap(code.MobileUIValidationError, err.Error())
|
||||
}
|
||||
return
|
||||
}
|
||||
sessionData := newSessionData()
|
||||
|
||||
Reference in New Issue
Block a user