GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-09-05 23:51:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add status code DeviceAppNotInstalled

Browse Source
This commit is contained in:
lilong.129
2024-12-23 17:51:55 +08:00
parent 2dac84de25
commit e44ad066c5
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hrp/code/code.go
+3 -2
View File
@@ -69,6 +69,7 @@ var (
DeviceConnectionError = errors.New("device general connection error") // 50 DeviceConnectionError = errors.New("device general connection error") // 50
DeviceHTTPDriverError = errors.New("device HTTP driver error") // 51 DeviceHTTPDriverError = errors.New("device HTTP driver error") // 51
DeviceUSBDriverError = errors.New("device USB driver error") // 52 DeviceUSBDriverError = errors.New("device USB driver error") // 52
DeviceAppNotInstalled = errors.New("device app not installed") // 59
DeviceGetInfoError = errors.New("device get info error") // 60 DeviceGetInfoError = errors.New("device get info error") // 60
DeviceConfigureError = errors.New("device configure error") // 61 DeviceConfigureError = errors.New("device configure error") // 61
DeviceShellExecError = errors.New("device shell exec error") // 62 DeviceShellExecError = errors.New("device shell exec error") // 62
@@ -168,6 +169,7 @@ var errorsMap = map[error]int{
DeviceConnectionError: 50, DeviceConnectionError: 50,
DeviceHTTPDriverError: 51, DeviceHTTPDriverError: 51,
DeviceUSBDriverError: 52, DeviceUSBDriverError: 52,
DeviceAppNotInstalled: 59,
DeviceGetInfoError: 60, DeviceGetInfoError: 60,
DeviceConfigureError: 61, DeviceConfigureError: 61,
DeviceShellExecError: 62, DeviceShellExecError: 62,
@@ -228,7 +230,7 @@ func GetErrorCode(err error) (errCode int) {
return return
} }
func GetErrorByCode(errCode int) (error) { func GetErrorByCode(errCode int) error {
if errCode < 0 { if errCode < 0 {
return nil return nil
} }
@@ -239,4 +241,3 @@ func GetErrorByCode(errCode int) (error) {
} }
return nil return nil
} }
hrp/internal/version/VERSION
+1 -1
View File
@@ -1 +1 @@
v5.0.0+2412231738 v5.0.0+2412231751
hrp/pkg/uixt/android_device.go
+3 -3
View File
@@ -518,7 +518,7 @@ func (dev *AndroidDevice) GetPackageInfo(packageName string) (AppInfo, error) {
appInfo.AppBaseInfo.VersionName = appVersion appInfo.AppBaseInfo.VersionName = appVersion
} else { } else {
log.Warn().Msg("failed to get package version") log.Warn().Msg("failed to get package version")
return appInfo, errors.Wrap(code.DeviceGetInfoError, err.Error()) return appInfo, errors.Wrap(code.DeviceAppNotInstalled, err.Error())
} }
// get package path // get package path
@@ -527,7 +527,7 @@ func (dev *AndroidDevice) GetPackageInfo(packageName string) (AppInfo, error) {
appInfo.AppBaseInfo.AppPath = packagePath appInfo.AppBaseInfo.AppPath = packagePath
} else { } else {
log.Warn().Msg("failed to get package path") log.Warn().Msg("failed to get package path")
return appInfo, errors.Wrap(code.DeviceGetInfoError, err.Error()) return appInfo, errors.Wrap(code.DeviceAppNotInstalled, err.Error())
} }
// get package md5 // get package md5
@@ -536,7 +536,7 @@ func (dev *AndroidDevice) GetPackageInfo(packageName string) (AppInfo, error) {
appInfo.AppBaseInfo.AppMD5 = packageMD5 appInfo.AppBaseInfo.AppMD5 = packageMD5
} else { } else {
log.Warn().Msg("failed to get package md5") log.Warn().Msg("failed to get package md5")
return appInfo, errors.Wrap(code.DeviceGetInfoError, err.Error()) return appInfo, errors.Wrap(code.DeviceAppNotInstalled, err.Error())
} }
return appInfo, nil return appInfo, nil
hrp/pkg/uixt/ios_device.go
+3 -3
View File
@@ -798,13 +798,13 @@ func (dev *IOSDevice) GetCurrentWindow() (WindowInfo, error) {
func (dev *IOSDevice) GetPackageInfo(packageName string) (AppInfo, error) { func (dev *IOSDevice) GetPackageInfo(packageName string) (AppInfo, error) {
svc, err := installationproxy.New(dev.d) svc, err := installationproxy.New(dev.d)
if err != nil { if err != nil {
return AppInfo{}, err return AppInfo{}, errors.Wrap(code.DeviceGetInfoError, err.Error())
} }
defer svc.Close() defer svc.Close()
apps, err := svc.BrowseAllApps() apps, err := svc.BrowseAllApps()
if err != nil { if err != nil {
return AppInfo{}, err return AppInfo{}, errors.Wrap(code.DeviceGetInfoError, err.Error())
} }
for _, app := range apps { for _, app := range apps {
@@ -824,6 +824,6 @@ func (dev *IOSDevice) GetPackageInfo(packageName string) (AppInfo, error) {
}, },
}, nil }, nil
} }
return AppInfo{}, errors.Wrap(code.DeviceGetInfoError, return AppInfo{}, errors.Wrap(code.DeviceAppNotInstalled,
fmt.Sprintf("%s not found", packageName)) fmt.Sprintf("%s not found", packageName))
} }