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: uia2 port and ip

Browse Source
This commit is contained in:
lilong.129
2024-10-09 15:57:24 +08:00
parent ffb0eb6620
commit 7506ebcb3b
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hrp/internal/version/VERSION
+1 -1
View File
@@ -1 +1 @@
v5.0.0-beta-2410091552 v5.0.0-beta-2410091557
hrp/pkg/uixt/android_device.go
+6 -5
View File
@@ -259,15 +259,15 @@ func (dev *AndroidDevice) NewDriver(options ...DriverOption) (driverExt *DriverE
// NewUSBDriver creates new client via USB connected device, this will also start a new session. // NewUSBDriver creates new client via USB connected device, this will also start a new session.
func (dev *AndroidDevice) NewUSBDriver(capabilities Capabilities) (driver IWebDriver, err error) { func (dev *AndroidDevice) NewUSBDriver(capabilities Capabilities) (driver IWebDriver, err error) {
localPort, err := dev.d.Forward(UIA2ServerPort) localPort, err := dev.d.Forward(dev.UIA2Port)
if err != nil { if err != nil {
return nil, errors.Wrap(code.DeviceConnectionError, return nil, errors.Wrap(code.DeviceConnectionError,
fmt.Sprintf("forward port %d->%d failed: %v", fmt.Sprintf("forward port %d->%d failed: %v",
localPort, UIA2ServerPort, err)) localPort, dev.UIA2Port, err))
} }
rawURL := fmt.Sprintf("http://%s%d:%d/wd/hub", rawURL := fmt.Sprintf("http://%s%d:%d/wd/hub",
forwardToPrefix, localPort, UIA2ServerPort) forwardToPrefix, localPort, dev.UIA2Port)
uiaDriver, err := NewUIADriver(capabilities, rawURL) uiaDriver, err := NewUIADriver(capabilities, rawURL)
if err != nil { if err != nil {
_ = dev.d.ForwardKill(localPort) _ = dev.d.ForwardKill(localPort)
@@ -534,7 +534,8 @@ func (dev *AndroidDevice) getPackageMD5(packagePath string) (string, error) {
} }
func (dev *AndroidDevice) startUIA2Server() error { func (dev *AndroidDevice) startUIA2Server() error {
out, err := dev.d.RunShellCommand("am", "instrument", "-w", UIA2ServerPackageName) log.Info().Msgf("start uiautomator server %s", dev.UIA2Package)
out, err := dev.d.RunShellCommand("am", "instrument", "-w", dev.UIA2Package)
if strings.Contains(out, "Process crashed") { if strings.Contains(out, "Process crashed") {
log.Error().Msg("uiautomator server crashed, restart...") log.Error().Msg("uiautomator server crashed, restart...")
return dev.startUIA2Server() return dev.startUIA2Server()
@@ -543,7 +544,7 @@ func (dev *AndroidDevice) startUIA2Server() error {
} }
func (dev *AndroidDevice) stopUIA2Server() error { func (dev *AndroidDevice) stopUIA2Server() error {
_, err := dev.d.RunShellCommand("am", "force-stop", UIA2ServerPackageName) _, err := dev.d.RunShellCommand("am", "force-stop", dev.UIA2Package)
return err return err
} }