From 4db263db15bcd5fa7e88e2c3996d57b9d592b4be Mon Sep 17 00:00:00 2001 From: "lilong.129" Date: Mon, 13 Feb 2023 23:34:09 +0800 Subject: [PATCH] fix: stop logcat only when enabled --- hrp/pkg/uixt/android_device.go | 4 ++++ hrp/pkg/uixt/interface.go | 1 + hrp/pkg/uixt/ios_device.go | 4 ++++ hrp/runner.go | 15 +++++++++------ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/hrp/pkg/uixt/android_device.go b/hrp/pkg/uixt/android_device.go index d70afa54..1bd43cdd 100644 --- a/hrp/pkg/uixt/android_device.go +++ b/hrp/pkg/uixt/android_device.go @@ -138,6 +138,10 @@ func (dev *AndroidDevice) UUID() string { return dev.SerialNumber } +func (dev *AndroidDevice) LogEnabled() bool { + return dev.LogOn +} + func (dev *AndroidDevice) NewDriver(capabilities Capabilities) (driverExt *DriverExt, err error) { var driver WebDriver if dev.UIA2 { diff --git a/hrp/pkg/uixt/interface.go b/hrp/pkg/uixt/interface.go index 865ed9fb..d9706a17 100644 --- a/hrp/pkg/uixt/interface.go +++ b/hrp/pkg/uixt/interface.go @@ -581,6 +581,7 @@ func NewData(data map[string]interface{}, options ...DataOption) map[string]inte // current implemeted device: IOSDevice, AndroidDevice type Device interface { UUID() string // ios udid or android serial + LogEnabled() bool NewDriver(capabilities Capabilities) (driverExt *DriverExt, err error) StartPerf() error diff --git a/hrp/pkg/uixt/ios_device.go b/hrp/pkg/uixt/ios_device.go index da8a9a33..c7fc3555 100644 --- a/hrp/pkg/uixt/ios_device.go +++ b/hrp/pkg/uixt/ios_device.go @@ -281,6 +281,10 @@ func (dev *IOSDevice) UUID() string { return dev.UDID } +func (dev *IOSDevice) LogEnabled() bool { + return dev.LogOn +} + func (dev *IOSDevice) NewDriver(capabilities Capabilities) (driverExt *DriverExt, err error) { // init WDA driver if capabilities == nil { diff --git a/hrp/runner.go b/hrp/runner.go index 7db22482..d81a3022 100644 --- a/hrp/runner.go +++ b/hrp/runner.go @@ -625,13 +625,16 @@ func (r *SessionRunner) GetSummary() (*TestCaseSummary, error) { for uuid, client := range r.caseRunner.hrpRunner.uiClients { // add WDA/UIA logs to summary - log, err := client.Driver.StopCaptureLog() - if err != nil { - return caseSummary, err - } logs := map[string]interface{}{ - "uuid": uuid, - "content": log, + "uuid": uuid, + } + + if client.Device.LogEnabled() { + log, err := client.Driver.StopCaptureLog() + if err != nil { + return caseSummary, err + } + logs["content"] = log } // stop performance monitor