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

change: update logcat args

Browse Source
This commit is contained in:
debugtalk
2023-02-13 21:47:53 +08:00
parent fe5dd0adb3
commit 5a67fc1155
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hrp/pkg/uixt/android_adb_driver.go
View File

@@ -321,6 +321,13 @@ func (ad *adbDriver) IsHealthy() (healthy bool, err error) {
func (ad *adbDriver) StartCaptureLog(identifier ...string) (err error) { func (ad *adbDriver) StartCaptureLog(identifier ...string) (err error) {
log.Info().Msg("start adb log recording") log.Info().Msg("start adb log recording")
// clear logcat
if _, err = ad.adbClient.RunShellCommand("logcat", "--clear"); err != nil {
return err
}
// start logcat
err = ad.logcat.CatchLogcat() err = ad.logcat.CatchLogcat()
if err != nil { if err != nil {
err = errors.Wrap(code.AndroidCaptureLogError, err = errors.Wrap(code.AndroidCaptureLogError,

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

@@ -311,12 +311,13 @@ func (l *AdbLogcat) CatchLogcat() (err error) {
} }
// clear logcat // clear logcat
if err = myexec.RunCommand("adb", "-s", l.serial, "logcat", "-c"); err != nil { if err = myexec.RunCommand("adb", "-s", l.serial, "logcat", "--clear"); err != nil {
return return
} }
// start logcat // start logcat
l.cmd = myexec.Command("adb", "-s", l.serial, "logcat", "-v", "time", "-s", "iesqaMonitor:V") l.cmd = myexec.Command("adb", "-s", l.serial,
"logcat", "--format", "time", "-s", "iesqaMonitor:V")
l.cmd.Stderr = l.logBuffer l.cmd.Stderr = l.logBuffer
l.cmd.Stdout = l.logBuffer l.cmd.Stdout = l.logBuffer
if err = l.cmd.Start(); err != nil { if err = l.cmd.Start(); err != nil {