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

fix: update interface of recording adb logs

Browse Source
This commit is contained in:
xucong053
2022-09-30 13:45:35 +08:00
parent 6e237429ed
commit 7deff77507
3 changed files with 14 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hrp/internal/uixt/android_device.go
View File

@@ -68,7 +68,10 @@ func InitUIAClient(device *AndroidDevice) (*DriverExt, error) {
} }
if device.LogOn { if device.LogOn {
err = driverExt.StartLogRecording("hrp_adb_log") err = driverExt.Driver.StartCaptureLog("hrp_adb_log")
if err != nil {
return nil, err
}
} }
return driverExt, err return driverExt, err

13
hrp/internal/uixt/android_driver.go
View File

@@ -947,11 +947,18 @@ func (ud *uiaDriver) Wait(condition Condition) error {
} }
func (ud *uiaDriver) StartCaptureLog(identifier ...string) (err error) { func (ud *uiaDriver) StartCaptureLog(identifier ...string) (err error) {
// TODO log.Info().Msg("start adb log recording")
err = ud.logcat.CatchLogcat()
return return
} }
func (ud *uiaDriver) StopCaptureLog() (result interface{}, err error) { func (ud *uiaDriver) StopCaptureLog() (result interface{}, err error) {
// TODO log.Info().Msg("stop adb log recording")
return err = ud.logcat.Stop()
if err != nil {
log.Error().Err(err).Msg("failed to get adb log recording")
return "", err
}
content := ud.logcat.logBuffer.String()
return ConvertPoints(content), nil
} }

39
hrp/internal/uixt/ext.go
View File

@@ -301,45 +301,6 @@ func (dExt *DriverExt) IsImageExist(text string) bool {
return err == nil return err == nil
} }
func (dExt *DriverExt) StartLogRecording(identifier string) error {
if _, ok := dExt.Driver.(*wdaDriver); ok {
log.Info().Msg("start WDA log recording")
data := map[string]interface{}{"action": "start", "type": 2, "identifier": identifier}
_, err := dExt.triggerWDALog(data)
if err != nil {
return errors.Wrap(err, "failed to start WDA log recording")
}
} else {
log.Info().Msg("start adb log recording")
err := dExt.Driver.(*uiaDriver).logcat.CatchLogcat()
if err != nil {
return errors.Wrap(err, "failed to start adb log recording")
}
}
return nil
}
func (dExt *DriverExt) GetLogs() (interface{}, error) {
if _, ok := dExt.Driver.(*wdaDriver); ok {
log.Info().Msg("stop WDA log recording")
data := map[string]interface{}{"action": "stop"}
reply, err := dExt.triggerWDALog(data)
if err != nil {
return "", errors.Wrap(err, "failed to get WDA logs")
}
return reply.Value, nil
} else {
log.Info().Msg("stop adb log recording")
err := dExt.Driver.(*uiaDriver).logcat.Stop()
if err != nil {
println("failed to get adb log recording")
//return "", errors.Wrap(err, "failed to get adb log recording")
}
content := dExt.Driver.(*uiaDriver).logcat.logBuffer.String()
return ConvertPoints(content), err
}
}
var errActionNotImplemented = errors.New("UI action not implemented") var errActionNotImplemented = errors.New("UI action not implemented")
func (dExt *DriverExt) DoAction(action MobileAction) error { func (dExt *DriverExt) DoAction(action MobileAction) error {