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

fix: logs

Browse Source
This commit is contained in:
debugtalk
2022-10-23 16:41:23 +08:00
parent 3848c486be
commit be8d8b5c5d
6 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,7 +132,8 @@ func (dev *AndroidDevice) NewDriver(capabilities Capabilities) (driverExt *Drive
driverExt, err = Extend(driver)
if err != nil {
return nil, errors.Wrap(err, "failed to extend UIA Driver")
return nil, errors.Wrap(code.MobileUIDriverError,
fmt.Sprintf("init UIA driver failed: %v", err))
}
if dev.LogOn {
@@ -143,7 +144,7 @@ func (dev *AndroidDevice) NewDriver(capabilities Capabilities) (driverExt *Drive
}
driverExt.UUID = dev.UUID()
return driverExt, err
return driverExt, nil
}
// NewUSBDriver creates new client via USB connected device, this will also start a new session.
@@ -151,17 +152,20 @@ func (dev *AndroidDevice) NewDriver(capabilities Capabilities) (driverExt *Drive
func (dev *AndroidDevice) NewUSBDriver(capabilities Capabilities) (driver *uiaDriver, err error) {
var localPort int
if localPort, err = getFreePort(); err != nil {
return nil, err
return nil, errors.Wrap(code.AndroidDeviceUSBDriverError,
fmt.Sprintf("get free port failed: %v", err))
}
if err = dev.d.Forward(localPort, UIA2ServerPort); err != nil {
return nil, err
return nil, errors.Wrap(code.AndroidDeviceUSBDriverError,
fmt.Sprintf("forward port %d->%d failed: %v",
localPort, UIA2ServerPort, err))
}
rawURL := fmt.Sprintf("http://%s%d:6790/wd/hub", forwardToPrefix, localPort)
driver, err = NewUIADriver(capabilities, rawURL)
if err != nil {
_ = dev.d.ForwardKill(localPort)
return nil, err
return nil, errors.Wrap(code.AndroidDeviceUSBDriverError, err.Error())
}
driver.adbDevice = dev.d
driver.logcat = dev.logcat

4
hrp/pkg/uixt/android_driver.go
View File

@@ -964,7 +964,7 @@ func (ud *uiaDriver) StartCaptureLog(identifier ...string) (err error) {
log.Info().Msg("start adb log recording")
err = ud.logcat.CatchLogcat()
if err != nil {
err = errors.Wrap(code.IOSCaptureLogError,
err = errors.Wrap(code.AndroidCaptureLogError,
fmt.Sprintf("start adb log recording failed: %v", err))
return err
}
@@ -976,7 +976,7 @@ func (ud *uiaDriver) StopCaptureLog() (result interface{}, err error) {
err = ud.logcat.Stop()
if err != nil {
log.Error().Err(err).Msg("failed to get adb log recording")
err = errors.Wrap(code.IOSCaptureLogError,
err = errors.Wrap(code.AndroidCaptureLogError,
fmt.Sprintf("get adb log recording failed: %v", err))
return "", err
}