diff --git a/hrp/internal/code/code.go b/hrp/internal/code/code.go index d0c56e3e..e47b729a 100644 --- a/hrp/internal/code/code.go +++ b/hrp/internal/code/code.go @@ -2,6 +2,7 @@ package code import ( "github.com/pkg/errors" + "github.com/rs/zerolog/log" ) // general: [0, 2) @@ -102,15 +103,19 @@ var errorsMap = map[error]int{ OCRTextNotFoundError: 84, } -func GetErrorCode(err error) int { +func GetErrorCode(err error) (exitCode int) { if err == nil { + log.Info().Int("code", Success).Msg("hrp exit") return Success } e := errors.Cause(err) if code, ok := errorsMap[e]; ok { - return code + exitCode = code + } else { + exitCode = GeneralFail } - return GeneralFail + log.Warn().Int("code", exitCode).Msg("hrp exit") + return } diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION index c510ef4d..6581f6f8 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v4.3.0-beta-10211516 \ No newline at end of file +v4.3.0-beta-10211541 \ No newline at end of file diff --git a/hrp/pkg/uixt/ios_device.go b/hrp/pkg/uixt/ios_device.go index fb8afdd6..6b2cadc1 100644 --- a/hrp/pkg/uixt/ios_device.go +++ b/hrp/pkg/uixt/ios_device.go @@ -306,8 +306,8 @@ func (dev *IOSDevice) forward(localPort, remotePort int) error { rInnerConn, err := device.NewConnect(remotePort) if err != nil { - log.Error().Err(err).Msg("connect to device failed") - os.Exit(1) + log.Error().Err(err).Msg("connect to ios device failed") + os.Exit(code.GetErrorCode(code.IOSDeviceConnectionError)) } rConn := rInnerConn.RawConn() diff --git a/httprunner/__init__.py b/httprunner/__init__.py index 83cf4c2c..866a4993 100644 --- a/httprunner/__init__.py +++ b/httprunner/__init__.py @@ -1,4 +1,4 @@ -__version__ = "v4.3.0-beta-10211516" +__version__ = "v4.3.0-beta-10211541" __description__ = "One-stop solution for HTTP(S) testing." diff --git a/pyproject.toml b/pyproject.toml index 8699011b..61308132 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "httprunner" -version = "v4.3.0-beta-10211516" +version = "v4.3.0-beta-10211541" description = "One-stop solution for HTTP(S) testing." license = "Apache-2.0" readme = "README.md"