From 2e2f1d8b26ca28e1cf86000c4a2c730aba5eec65 Mon Sep 17 00:00:00 2001 From: "huangbin.beal" Date: Wed, 6 Aug 2025 19:17:47 +0800 Subject: [PATCH] fix: pull folder --- uixt/android_driver_adb.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uixt/android_driver_adb.go b/uixt/android_driver_adb.go index d29ab91c..290e68a9 100644 --- a/uixt/android_driver_adb.go +++ b/uixt/android_driver_adb.go @@ -24,6 +24,7 @@ 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" @@ -707,13 +708,12 @@ 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` - ad.Device.PullFolder(config.DeviceActionLogFilePath, actionLogDirPath) + myexec.RunCommand("adb", "-s", ad.Device.Serial(), "pull", config.DeviceActionLogFilePath, actionLogDirPath) err = filepath.Walk(actionLogDirPath, func(path string, info fs.FileInfo, err error) error { // 只是需要日志文件 if ok, _ := regexp.MatchString(actionLogRegStr, path); ok {