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

change: update logs for init andoird/ios devices

Browse Source
This commit is contained in:
lilong.129
2023-09-06 14:40:09 +08:00
parent abe7fe5e25
commit 5cacd17a6a
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,11 +95,19 @@ func NewAndroidDevice(options ...AndroidDeviceOption) (device *AndroidDevice, er
} }
dev := deviceList[0] dev := deviceList[0]
device.SerialNumber = dev.Serial()
if device.SerialNumber == "" {
selectSerial := dev.Serial()
device.SerialNumber = selectSerial
log.Warn().
Str("serial", device.SerialNumber).
Msg("android SerialNumber is not specified, select the first one")
}
device.d = dev device.d = dev
device.logcat = NewAdbLogcat(device.SerialNumber) device.logcat = NewAdbLogcat(device.SerialNumber)
log.Info().Str("serial", device.SerialNumber).Msg("select android device") log.Info().Str("serial", device.SerialNumber).Msg("init android device")
return device, nil return device, nil
} }

11
hrp/pkg/uixt/ios_device.go
View File

@@ -239,7 +239,14 @@ func NewIOSDevice(options ...IOSDeviceOption) (device *IOSDevice, err error) {
dev := deviceList[0] dev := deviceList[0]
udid := dev.Properties().SerialNumber udid := dev.Properties().SerialNumber
device.UDID = udid
if device.UDID == "" {
device.UDID = udid
log.Warn().
Str("udid", udid).
Msg("ios UDID is not specified, select the first one")
}
device.d = dev device.d = dev
// run xctest if XCTestBundleID is set // run xctest if XCTestBundleID is set
@@ -251,7 +258,7 @@ func NewIOSDevice(options ...IOSDeviceOption) (device *IOSDevice, err error) {
} }
} }
log.Info().Str("udid", device.UDID).Msg("select ios device") log.Info().Str("udid", device.UDID).Msg("init ios device")
return device, nil return device, nil
} }