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

refactor: hrp code

Browse Source
This commit is contained in:
lilong.129
2024-09-12 10:54:02 +08:00
parent 9fc9e8620f
commit 6f6cefe4bc
9 changed files with 61 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hrp/pkg/gadb/client.go
+1 -1
View File
@@ -90,7 +90,7 @@ func (c Client) DeviceSerialList() (serials []string, err error) {
func (c Client) DeviceList() (devices []*Device, err error) {
defer func() {
if err != nil && errors.Cause(err) == nil {
err = errors.Wrap(code.AndroidDeviceConnectionError, err.Error())
err = errors.Wrap(code.DeviceConnectionError, err.Error())
}
}()
hrp/pkg/gadb/device.go
+1 -1
View File
@@ -327,7 +327,7 @@ func (d *Device) ReverseForwardKillAll() error {
func (d *Device) RunShellCommand(cmd string, args ...string) (string, error) {
raw, err := d.RunShellCommandWithBytes(cmd, args...)
if err != nil && errors.Cause(err) == nil {
err = errors.Wrap(code.AndroidShellExecError, err.Error())
err = errors.Wrap(code.DeviceShellExecError, err.Error())
}
return string(raw), err
}
hrp/pkg/gadb/transport.go
+3 -3
View File
@@ -42,18 +42,18 @@ func newTransport(address string, readTimeout ...time.Duration) (tp transport, e
// connection refused
if strings.Contains(err.Error(), "connect: connection refused") {
err = errors.Wrap(code.AndroidDeviceConnectionRefusedError, err.Error())
err = errors.Wrap(code.DeviceConnectionError, err.Error())
return
}
// device offline
if regexDeviceOffline.MatchString(err.Error()) {
err = errors.Wrap(code.AndroidDeviceOfflineError, err.Error())
err = errors.Wrap(code.DeviceOfflineError, err.Error())
return
}
// other connection errors
err = errors.Wrap(code.AndroidDeviceConnectionError, err.Error())
err = errors.Wrap(code.DeviceConnectionError, err.Error())
return
}