fix: adb shell pull

This commit is contained in:
huangbin.beal
2025-08-06 15:57:06 +08:00
parent 62f129963b
commit 42c4ffba8a

View File

@@ -24,7 +24,6 @@ import (
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/httprunner/funplugin/myexec"
"github.com/httprunner/httprunner/v5/code"
"github.com/httprunner/httprunner/v5/internal/config"
"github.com/httprunner/httprunner/v5/internal/utf7"
@@ -708,12 +707,13 @@ func (ad *ADBDriver) StopCaptureLog() (result interface{}, err error) {
}
pointRes := ConvertPoints(ad.Device.Logcat.logs)
// 没有解析到打点日志,走兜底逻辑
pointRes = []ExportPoint{}
if len(pointRes) == 0 {
log.Info().Msg("action log is null, use action file >>>")
actionLogDirPath := config.GetConfig().ActionLogDirPath()
files := []string{}
actionLogRegStr := `.*data_\d+\.txt`
myexec.RunCommand("adb", "-s", ad.Device.Serial(), "pull", config.DeviceActionLogFilePath, actionLogDirPath)
ad.Device.PullFolder(config.DeviceActionLogFilePath, actionLogDirPath)
err = filepath.Walk(actionLogDirPath, func(path string, info fs.FileInfo, err error) error {
// 只是需要日志文件
if ok, _ := regexp.MatchString(actionLogRegStr, path); ok {