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

fix: device serial/udid should be specified

Browse Source
This commit is contained in:
buyuxiang
2023-10-07 19:45:41 +08:00
committed by buyuxiang
parent acbb3902cc
commit 41f705c0d9
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hrp/internal/version/VERSION
View File

@@ -1 +1 @@
v4.3.6.20230926 v4.3.6.2310081724

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

@@ -88,10 +88,13 @@ func NewAndroidDevice(options ...AndroidDeviceOption) (device *AndroidDevice, er
for _, option := range options { for _, option := range options {
option(device) option(device)
} }
deviceList, err := GetAndroidDevices(device.SerialNumber) deviceList, err := GetAndroidDevices(device.SerialNumber)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrap(code.AndroidDeviceConnectionError, err.Error())
}
if device.SerialNumber == "" && len(deviceList) > 1 {
return nil, errors.Wrap(code.AndroidDeviceConnectionError, "more than one device connected, please specify the serial")
} }
dev := deviceList[0] dev := deviceList[0]

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

@@ -237,6 +237,10 @@ func NewIOSDevice(options ...IOSDeviceOption) (device *IOSDevice, err error) {
return nil, errors.Wrap(code.IOSDeviceConnectionError, err.Error()) return nil, errors.Wrap(code.IOSDeviceConnectionError, err.Error())
} }
if device.UDID == "" && len(deviceList) > 1 {
return nil, errors.Wrap(code.IOSDeviceConnectionError, "more than one device connected, please specify the udid")
}
dev := deviceList[0] dev := deviceList[0]
udid := dev.Properties().SerialNumber udid := dev.Properties().SerialNumber