From c8878c34b521578470bb4dcbb37f027c22d3bc77 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Mon, 24 Oct 2022 15:25:09 +0800 Subject: [PATCH] fix: parse error exit code --- docs/CHANGELOG.md | 4 ++-- hrp/internal/version/VERSION | 2 +- hrp/internal/version/init.go | 2 +- hrp/pkg/gadb/client_test.go | 2 ++ hrp/pkg/gadb/device_test.go | 2 ++ hrp/pkg/gadb/transport_test.go | 2 ++ hrp/pkg/gidevice/.gitignore | 1 - hrp/pkg/gidevice/afc_test.go | 2 ++ hrp/pkg/gidevice/crashreportmover_test.go | 2 ++ hrp/pkg/gidevice/device_test.go | 2 ++ hrp/pkg/gidevice/housearrest_test.go | 2 ++ hrp/pkg/gidevice/imagemounter_test.go | 2 ++ hrp/pkg/gidevice/installationproxy_test.go | 2 ++ hrp/pkg/gidevice/instruments_test.go | 2 ++ hrp/pkg/gidevice/lockdown_test.go | 2 ++ hrp/pkg/gidevice/perfd_test.go | 2 ++ hrp/pkg/gidevice/pkg/ipa/ipa_test.go | 2 ++ hrp/pkg/gidevice/pkg/nskeyedarchiver/nsarray_test.go | 2 ++ hrp/pkg/gidevice/pkg/nskeyedarchiver/nsdictionary_test.go | 2 ++ .../gidevice/pkg/nskeyedarchiver/nskeyedarchiver_test.go | 2 ++ hrp/pkg/gidevice/pkg/nskeyedarchiver/nsurl_test.go | 2 ++ hrp/pkg/gidevice/pkg/nskeyedarchiver/nsuuid_test.go | 2 ++ .../pkg/nskeyedarchiver/xctestconfiguration_test.go | 2 ++ hrp/pkg/gidevice/screenshot_test.go | 2 ++ hrp/pkg/gidevice/simulatelocation_test.go | 2 ++ hrp/pkg/gidevice/springboard_test.go | 2 ++ hrp/pkg/gidevice/usbmux_test.go | 2 ++ hrp/pkg/uixt/ios_device.go | 5 +++++ hrp/step_mobile_ui.go | 7 +++++-- 29 files changed, 60 insertions(+), 7 deletions(-) delete mode 100644 hrp/pkg/gidevice/.gitignore diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 94b591a7..5a0bfdd0 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## v4.3.0 (2022-10-23) +## v4.3.0 (2022-10-24) Release hrp sub package `uixt` to support iOS/Android UI automation 🎉 @@ -10,7 +10,7 @@ Release hrp sub package `uixt` to support iOS/Android UI automation 🎉 For iOS/Android device management: -- feat: integrage ios device management with [gidevice], +- feat: integrage ios device management with [gidevice] - feat: integrage android device management with [gadb] - feat: add simple commands to interact with iOS/Android devices, try `hrp ios` and `hrp adb` diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION index 1ddc0f60..bf493a39 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v4.3.0 \ No newline at end of file +v4.3.0-10241627 \ No newline at end of file diff --git a/hrp/internal/version/init.go b/hrp/internal/version/init.go index d1f1513e..ace1acc3 100644 --- a/hrp/internal/version/init.go +++ b/hrp/internal/version/init.go @@ -8,4 +8,4 @@ import ( var VERSION string // httprunner python version -const HttpRunnerMinimumVersion = "v4.2.0" +const HttpRunnerMinimumVersion = "v4.3.0" diff --git a/hrp/pkg/gadb/client_test.go b/hrp/pkg/gadb/client_test.go index 677e3455..61b613b2 100644 --- a/hrp/pkg/gadb/client_test.go +++ b/hrp/pkg/gadb/client_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package gadb import ( diff --git a/hrp/pkg/gadb/device_test.go b/hrp/pkg/gadb/device_test.go index 8dca27cf..7df8ef08 100644 --- a/hrp/pkg/gadb/device_test.go +++ b/hrp/pkg/gadb/device_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package gadb import ( diff --git a/hrp/pkg/gadb/transport_test.go b/hrp/pkg/gadb/transport_test.go index 6b3b9b21..96986365 100644 --- a/hrp/pkg/gadb/transport_test.go +++ b/hrp/pkg/gadb/transport_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package gadb import ( diff --git a/hrp/pkg/gidevice/.gitignore b/hrp/pkg/gidevice/.gitignore deleted file mode 100644 index 757fee31..00000000 --- a/hrp/pkg/gidevice/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/.idea \ No newline at end of file diff --git a/hrp/pkg/gidevice/afc_test.go b/hrp/pkg/gidevice/afc_test.go index 7a31950a..af369a8f 100644 --- a/hrp/pkg/gidevice/afc_test.go +++ b/hrp/pkg/gidevice/afc_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package gidevice import ( diff --git a/hrp/pkg/gidevice/crashreportmover_test.go b/hrp/pkg/gidevice/crashreportmover_test.go index dda597ea..6fade871 100644 --- a/hrp/pkg/gidevice/crashreportmover_test.go +++ b/hrp/pkg/gidevice/crashreportmover_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package gidevice import ( diff --git a/hrp/pkg/gidevice/device_test.go b/hrp/pkg/gidevice/device_test.go index ad11b9ed..c5290db2 100644 --- a/hrp/pkg/gidevice/device_test.go +++ b/hrp/pkg/gidevice/device_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package gidevice import ( diff --git a/hrp/pkg/gidevice/housearrest_test.go b/hrp/pkg/gidevice/housearrest_test.go index 6c69bcc3..6f5b3323 100644 --- a/hrp/pkg/gidevice/housearrest_test.go +++ b/hrp/pkg/gidevice/housearrest_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package gidevice import ( diff --git a/hrp/pkg/gidevice/imagemounter_test.go b/hrp/pkg/gidevice/imagemounter_test.go index d42f3583..00e6dbb3 100644 --- a/hrp/pkg/gidevice/imagemounter_test.go +++ b/hrp/pkg/gidevice/imagemounter_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package gidevice import ( diff --git a/hrp/pkg/gidevice/installationproxy_test.go b/hrp/pkg/gidevice/installationproxy_test.go index d4298568..603dba18 100644 --- a/hrp/pkg/gidevice/installationproxy_test.go +++ b/hrp/pkg/gidevice/installationproxy_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package gidevice import ( diff --git a/hrp/pkg/gidevice/instruments_test.go b/hrp/pkg/gidevice/instruments_test.go index 5da93259..9e8f367e 100644 --- a/hrp/pkg/gidevice/instruments_test.go +++ b/hrp/pkg/gidevice/instruments_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package gidevice import ( diff --git a/hrp/pkg/gidevice/lockdown_test.go b/hrp/pkg/gidevice/lockdown_test.go index da4e975f..c248bf4c 100644 --- a/hrp/pkg/gidevice/lockdown_test.go +++ b/hrp/pkg/gidevice/lockdown_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package gidevice import ( diff --git a/hrp/pkg/gidevice/perfd_test.go b/hrp/pkg/gidevice/perfd_test.go index 7e07849a..4c340332 100644 --- a/hrp/pkg/gidevice/perfd_test.go +++ b/hrp/pkg/gidevice/perfd_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package gidevice import ( diff --git a/hrp/pkg/gidevice/pkg/ipa/ipa_test.go b/hrp/pkg/gidevice/pkg/ipa/ipa_test.go index 10474b4d..6857cb5c 100644 --- a/hrp/pkg/gidevice/pkg/ipa/ipa_test.go +++ b/hrp/pkg/gidevice/pkg/ipa/ipa_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package ipa import ( diff --git a/hrp/pkg/gidevice/pkg/nskeyedarchiver/nsarray_test.go b/hrp/pkg/gidevice/pkg/nskeyedarchiver/nsarray_test.go index 5274bfc6..23b86032 100644 --- a/hrp/pkg/gidevice/pkg/nskeyedarchiver/nsarray_test.go +++ b/hrp/pkg/gidevice/pkg/nskeyedarchiver/nsarray_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package nskeyedarchiver import ( diff --git a/hrp/pkg/gidevice/pkg/nskeyedarchiver/nsdictionary_test.go b/hrp/pkg/gidevice/pkg/nskeyedarchiver/nsdictionary_test.go index e3becc6b..2b385c44 100644 --- a/hrp/pkg/gidevice/pkg/nskeyedarchiver/nsdictionary_test.go +++ b/hrp/pkg/gidevice/pkg/nskeyedarchiver/nsdictionary_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package nskeyedarchiver import ( diff --git a/hrp/pkg/gidevice/pkg/nskeyedarchiver/nskeyedarchiver_test.go b/hrp/pkg/gidevice/pkg/nskeyedarchiver/nskeyedarchiver_test.go index fa6cf849..21b56902 100644 --- a/hrp/pkg/gidevice/pkg/nskeyedarchiver/nskeyedarchiver_test.go +++ b/hrp/pkg/gidevice/pkg/nskeyedarchiver/nskeyedarchiver_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package nskeyedarchiver import ( diff --git a/hrp/pkg/gidevice/pkg/nskeyedarchiver/nsurl_test.go b/hrp/pkg/gidevice/pkg/nskeyedarchiver/nsurl_test.go index 413a202d..c30c0ce4 100644 --- a/hrp/pkg/gidevice/pkg/nskeyedarchiver/nsurl_test.go +++ b/hrp/pkg/gidevice/pkg/nskeyedarchiver/nsurl_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package nskeyedarchiver import ( diff --git a/hrp/pkg/gidevice/pkg/nskeyedarchiver/nsuuid_test.go b/hrp/pkg/gidevice/pkg/nskeyedarchiver/nsuuid_test.go index 2b223ca8..55e77c2e 100644 --- a/hrp/pkg/gidevice/pkg/nskeyedarchiver/nsuuid_test.go +++ b/hrp/pkg/gidevice/pkg/nskeyedarchiver/nsuuid_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package nskeyedarchiver import ( diff --git a/hrp/pkg/gidevice/pkg/nskeyedarchiver/xctestconfiguration_test.go b/hrp/pkg/gidevice/pkg/nskeyedarchiver/xctestconfiguration_test.go index c68f433e..77bf9d4f 100644 --- a/hrp/pkg/gidevice/pkg/nskeyedarchiver/xctestconfiguration_test.go +++ b/hrp/pkg/gidevice/pkg/nskeyedarchiver/xctestconfiguration_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package nskeyedarchiver import ( diff --git a/hrp/pkg/gidevice/screenshot_test.go b/hrp/pkg/gidevice/screenshot_test.go index eb751fbd..cec2e400 100644 --- a/hrp/pkg/gidevice/screenshot_test.go +++ b/hrp/pkg/gidevice/screenshot_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package gidevice import ( diff --git a/hrp/pkg/gidevice/simulatelocation_test.go b/hrp/pkg/gidevice/simulatelocation_test.go index df6833ef..fde9e2a1 100644 --- a/hrp/pkg/gidevice/simulatelocation_test.go +++ b/hrp/pkg/gidevice/simulatelocation_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package gidevice import "testing" diff --git a/hrp/pkg/gidevice/springboard_test.go b/hrp/pkg/gidevice/springboard_test.go index 98cc034a..331213c9 100644 --- a/hrp/pkg/gidevice/springboard_test.go +++ b/hrp/pkg/gidevice/springboard_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package gidevice import ( diff --git a/hrp/pkg/gidevice/usbmux_test.go b/hrp/pkg/gidevice/usbmux_test.go index 3509ce93..72cb47a5 100644 --- a/hrp/pkg/gidevice/usbmux_test.go +++ b/hrp/pkg/gidevice/usbmux_test.go @@ -1,3 +1,5 @@ +//go:build localtest + package gidevice import ( diff --git a/hrp/pkg/uixt/ios_device.go b/hrp/pkg/uixt/ios_device.go index be21cebd..ff318ea2 100644 --- a/hrp/pkg/uixt/ios_device.go +++ b/hrp/pkg/uixt/ios_device.go @@ -398,6 +398,8 @@ func (dev *IOSDevice) NewHTTPDriver(capabilities Capabilities) (driver WebDriver return nil, errors.Wrap(code.IOSDeviceHTTPDriverError, fmt.Sprintf("forward tcp port failed: %v", err)) } + } else { + log.Info().Int("WDA_LOCAL_PORT", localPort).Msg("reuse WDA local port") } var localMjpegPort int @@ -412,6 +414,9 @@ func (dev *IOSDevice) NewHTTPDriver(capabilities Capabilities) (driver WebDriver return nil, errors.Wrap(code.IOSDeviceHTTPDriverError, fmt.Sprintf("forward tcp port failed: %v", err)) } + } else { + log.Info().Int("WDA_LOCAL_MJPEG_PORT", localMjpegPort). + Msg("reuse WDA local mjpeg port") } log.Info().Interface("capabilities", capabilities). diff --git a/hrp/step_mobile_ui.go b/hrp/step_mobile_ui.go index 3bf934cd..6f9fe7fb 100644 --- a/hrp/step_mobile_ui.go +++ b/hrp/step_mobile_ui.go @@ -613,8 +613,11 @@ func runStepMobileUI(s *SessionRunner, step *TStep) (stepResult *StepResult, err // run actions for _, action := range actions { if action.Params, err = s.caseRunner.parser.Parse(action.Params, stepVariables); err != nil { - return stepResult, errors.Wrap(code.ParseError, - fmt.Sprintf("parse action params failed: %v", err)) + if !code.IsErrorPredefined(err) { + err = errors.Wrap(code.ParseError, + fmt.Sprintf("parse action params failed: %v", err)) + } + return stepResult, err } if err := uiDriver.DoAction(action); err != nil { if !code.IsErrorPredefined(err) {