GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-06-11 10:49:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复error未处理

Browse Source
This commit is contained in:
余泓铮
2024-08-15 14:27:47 +08:00
parent c6b6f3b2e5
commit 9aec5edb96
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hrp/pkg/uixt/android_device.go
View File

@@ -10,7 +10,6 @@ import (
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"io" "io"
"net"
"os" "os"
"os/exec" "os/exec"
"regexp" "regexp"
@@ -335,6 +334,7 @@ func (dev *AndroidDevice) Uninstall(packageName string) error {
func (dev *AndroidDevice) Install(appPath string, opts *InstallOptions) error { func (dev *AndroidDevice) Install(appPath string, opts *InstallOptions) error {
app, err := os.Open(appPath) app, err := os.Open(appPath)
defer app.Close()
if err != nil { if err != nil {
return errors.Wrap(err, fmt.Sprintf("install %s open file failed", appPath)) return errors.Wrap(err, fmt.Sprintf("install %s open file failed", appPath))
} }
@@ -438,20 +438,6 @@ func (dev *AndroidDevice) installCommon(app io.ReadSeeker, args ...string) error
return err return err
} }
func getFreePort() (int, error) {
addr, err := net.ResolveTCPAddr("tcp", "localhost:0")
if err != nil {
return 0, errors.Wrap(err, "resolve tcp addr failed")
}
l, err := net.ListenTCP("tcp", addr)
if err != nil {
return 0, errors.Wrap(err, "listen tcp addr failed")
}
defer func() { _ = l.Close() }()
return l.Addr().(*net.TCPAddr).Port, nil
}
type LineCallback func(string) type LineCallback func(string)
type AdbLogcat struct { type AdbLogcat struct {

15
hrp/pkg/uixt/android_shoots_driver.go
View File

@@ -143,6 +143,9 @@ func (sad *ShootsAndroidDriver) close() error {
func (sad *ShootsAndroidDriver) Status() (DeviceStatus, error) { func (sad *ShootsAndroidDriver) Status() (DeviceStatus, error) {
app, err := sad.GetForegroundApp() app, err := sad.GetForegroundApp()
if err != nil {
return DeviceStatus{}, err
}
res, err := sad.sendCommand(app.PackageName, "Hello", nil) res, err := sad.sendCommand(app.PackageName, "Hello", nil)
if err != nil { if err != nil {
return DeviceStatus{}, err return DeviceStatus{}, err
@@ -153,6 +156,9 @@ func (sad *ShootsAndroidDriver) Status() (DeviceStatus, error) {
func (sad *ShootsAndroidDriver) Source(srcOpt ...SourceOption) (source string, err error) { func (sad *ShootsAndroidDriver) Source(srcOpt ...SourceOption) (source string, err error) {
app, err := sad.GetForegroundApp() app, err := sad.GetForegroundApp()
if err != nil {
return "", err
}
params := map[string]interface{}{ params := map[string]interface{}{
"ClassName": "com.bytedance.byteinsight.MockOperator", "ClassName": "com.bytedance.byteinsight.MockOperator",
"Method": "getLayout", "Method": "getLayout",
@@ -183,6 +189,9 @@ func (sad *ShootsAndroidDriver) LoginNoneUI(packageName, phoneNumber, captcha st
"code": captcha, "code": captcha,
} }
resp, err := sad.httpPOST(params, "/host", "/login", "account") resp, err := sad.httpPOST(params, "/host", "/login", "account")
if err != nil {
return err
}
res, err := resp.valueConvertToJsonObject() res, err := resp.valueConvertToJsonObject()
if err != nil { if err != nil {
return err return err
@@ -206,6 +215,9 @@ func (sad *ShootsAndroidDriver) LoginNoneUI(packageName, phoneNumber, captcha st
func (sad *ShootsAndroidDriver) LogoutNoneUI(packageName string) error { func (sad *ShootsAndroidDriver) LogoutNoneUI(packageName string) error {
resp, err := sad.httpGET("/host", "/logout") resp, err := sad.httpGET("/host", "/logout")
if err != nil {
return err
}
res, err := resp.valueConvertToJsonObject() res, err := resp.valueConvertToJsonObject()
if err != nil { if err != nil {
return err return err
@@ -240,6 +252,9 @@ func (sad *ShootsAndroidDriver) LoginNoneUIDynamic(packageName, phoneNumber stri
func (sad *ShootsAndroidDriver) isLogin(packageName string) (login bool, err error) { func (sad *ShootsAndroidDriver) isLogin(packageName string) (login bool, err error) {
resp, err := sad.httpGET("/host", "/login", "/check") resp, err := sad.httpGET("/host", "/login", "/check")
if err != nil {
return false, err
}
res, err := resp.valueConvertToJsonObject() res, err := resp.valueConvertToJsonObject()
if err != nil { if err != nil {
return false, err return false, err