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

fix: resolve conflicts

Browse Source
This commit is contained in:
徐聪
2024-07-19 15:11:16 +08:00
parent 831419a25c 55bdfc49be
commit 42f68e0641
36 changed files with 2018 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hrp/pkg/uixt/ios_device.go
+7 -2
View File
@@ -16,6 +16,7 @@ import (
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/code"
"github.com/httprunner/httprunner/v4/hrp/internal/env"
"github.com/httprunner/httprunner/v4/hrp/pkg/gidevice"
@@ -237,6 +238,10 @@ func NewIOSDevice(options ...IOSDeviceOption) (device *IOSDevice, 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]
udid := dev.Properties().SerialNumber
@@ -592,7 +597,7 @@ func (dev *IOSDevice) NewHTTPDriver(capabilities Capabilities) (driver WebDriver
var localPort int
localPort, err = strconv.Atoi(env.WDA_LOCAL_PORT)
if err != nil {
localPort, err = getFreePort()
localPort, err = builtin.GetFreePort()
if err != nil {
return nil, errors.Wrap(code.IOSDeviceHTTPDriverError,
fmt.Sprintf("get free port failed: %v", err))
@@ -609,7 +614,7 @@ func (dev *IOSDevice) NewHTTPDriver(capabilities Capabilities) (driver WebDriver
var localMjpegPort int
localMjpegPort, err = strconv.Atoi(env.WDA_LOCAL_MJPEG_PORT)
if err != nil {
localMjpegPort, err = getFreePort()
localMjpegPort, err = builtin.GetFreePort()
if err != nil {
return nil, errors.Wrap(code.IOSDeviceHTTPDriverError,
fmt.Sprintf("get free port failed: %v", err))