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

change: wda ports are used preferentially from environment variables

Browse Source
This commit is contained in:
xucong.053
2022-10-23 21:03:39 +08:00
parent 30421f2945
commit 9311e52e44
2 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hrp/internal/env/env.go vendored
View File

@@ -4,6 +4,8 @@ import "os"
var ( var (
WDA_USB_DRIVER = os.Getenv("WDA_USB_DRIVER") WDA_USB_DRIVER = os.Getenv("WDA_USB_DRIVER")
WDA_LOCAL_PORT = os.Getenv("WDA_LOCAL_PORT")
WDA_LOCAL_MJPEG_PORT = os.Getenv("WDA_LOCAL_MJPEG_PORT")
VEDEM_OCR_URL = os.Getenv("VEDEM_OCR_URL") VEDEM_OCR_URL = os.Getenv("VEDEM_OCR_URL")
VEDEM_OCR_AK = os.Getenv("VEDEM_OCR_AK") VEDEM_OCR_AK = os.Getenv("VEDEM_OCR_AK")
VEDEM_OCR_SK = os.Getenv("VEDEM_OCR_SK") VEDEM_OCR_SK = os.Getenv("VEDEM_OCR_SK")

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

@@ -13,6 +13,7 @@ import (
"net/url" "net/url"
"os" "os"
"regexp" "regexp"
"strconv"
"strings" "strings"
"time" "time"
@@ -384,16 +385,25 @@ func (dev *IOSDevice) perfOpitons() (perfOptions []giDevice.PerfOption) {
// NewHTTPDriver creates new remote HTTP client, this will also start a new session. // NewHTTPDriver creates new remote HTTP client, this will also start a new session.
func (dev *IOSDevice) NewHTTPDriver(capabilities Capabilities) (driver WebDriver, err error) { func (dev *IOSDevice) NewHTTPDriver(capabilities Capabilities) (driver WebDriver, err error) {
localPort, err := getFreePort() var localPort int
localPort, err = strconv.Atoi(env.WDA_LOCAL_PORT)
if err != nil {
localPort, err = getFreePort()
if err != nil { if err != nil {
return nil, errors.Wrap(code.IOSDeviceHTTPDriverError, return nil, errors.Wrap(code.IOSDeviceHTTPDriverError,
fmt.Sprintf("get free port failed: %v", err)) fmt.Sprintf("get free port failed: %v", err))
} }
if err = dev.forward(localPort, dev.Port); err != nil { if err = dev.forward(localPort, dev.Port); err != nil {
return nil, errors.Wrap(code.IOSDeviceHTTPDriverError, return nil, errors.Wrap(code.IOSDeviceHTTPDriverError,
fmt.Sprintf("forward tcp port failed: %v", err)) fmt.Sprintf("forward tcp port failed: %v", err))
} }
localMjpegPort, err := getFreePort() }
var localMjpegPort int
localMjpegPort, err = strconv.Atoi(env.WDA_LOCAL_MJPEG_PORT)
if err != nil {
localMjpegPort, err = getFreePort()
if err != nil { if err != nil {
return nil, errors.Wrap(code.IOSDeviceHTTPDriverError, return nil, errors.Wrap(code.IOSDeviceHTTPDriverError,
fmt.Sprintf("get free port failed: %v", err)) fmt.Sprintf("get free port failed: %v", err))
@@ -402,6 +412,7 @@ func (dev *IOSDevice) NewHTTPDriver(capabilities Capabilities) (driver WebDriver
return nil, errors.Wrap(code.IOSDeviceHTTPDriverError, return nil, errors.Wrap(code.IOSDeviceHTTPDriverError,
fmt.Sprintf("forward tcp port failed: %v", err)) fmt.Sprintf("forward tcp port failed: %v", err))
} }
}
log.Info().Interface("capabilities", capabilities). log.Info().Interface("capabilities", capabilities).
Int("localPort", localPort).Int("localMjpegPort", localMjpegPort). Int("localPort", localPort).Int("localMjpegPort", localMjpegPort).