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

feat: lazy setup WDA

Browse Source
This commit is contained in:
lilong.129
2025-02-19 16:54:26 +08:00
parent bf78e6702a
commit a4b0fc2ed5
5 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/version/VERSION
View File

@@ -1 +1 @@
v5.0.0+2502191537 v5.0.0+2502191654

3
pkg/uixt/driver_ext/ios_stub_driver.go
View File

@@ -30,6 +30,9 @@ const (
) )
func NewStubIOSDriver(dev *uixt.IOSDevice) (*StubIOSDriver, error) { func NewStubIOSDriver(dev *uixt.IOSDevice) (*StubIOSDriver, error) {
// lazy setup WDA
dev.Options.LazySetup = true
wdaDriver, err := uixt.NewWDADriver(dev) wdaDriver, err := uixt.NewWDADriver(dev)
if err != nil { if err != nil {
return nil, err return nil, err

8
pkg/uixt/ios_driver_wda.go
View File

@@ -37,9 +37,11 @@ func NewWDADriver(device *IOSDevice) (*WDADriver, error) {
Session: NewDriverSession(), Session: NewDriverSession(),
} }
// setup driver if !device.Options.LazySetup {
if err := driver.Setup(); err != nil { // setup driver
return nil, err if err := driver.Setup(); err != nil {
return nil, err
}
} }
// register driver session reset handler // register driver session reset handler

14
pkg/uixt/ios_test.go
View File

@@ -33,6 +33,20 @@ func TestDevice_IOS_Install(t *testing.T) {
assert.Nil(t, err) assert.Nil(t, err)
} }
func TestDriver_WDA_LazySetup(t *testing.T) {
device, err := NewIOSDevice(
option.WithWDAPort(8700),
option.WithWDAMjpegPort(8800),
option.WithLazySetup(true))
require.Nil(t, err)
driver, err := NewWDADriver(device)
require.Nil(t, err)
err = driver.PressButton(types.DeviceButtonHome)
assert.Nil(t, err)
err = driver.TapXY(0.5, 0.5)
assert.Nil(t, err)
}
func TestDevice_IOS_New(t *testing.T) { func TestDevice_IOS_New(t *testing.T) {
device, err := NewIOSDevice( device, err := NewIOSDevice(
option.WithWDAPort(8700), option.WithWDAPort(8700),

10
pkg/uixt/option/ios.go
View File

@@ -5,6 +5,7 @@ type IOSDeviceOptions struct {
WDAPort int `json:"port,omitempty" yaml:"port,omitempty"` // WDA remote port WDAPort int `json:"port,omitempty" yaml:"port,omitempty"` // WDA remote port
WDAMjpegPort int `json:"mjpeg_port,omitempty" yaml:"mjpeg_port,omitempty"` // WDA remote MJPEG port WDAMjpegPort int `json:"mjpeg_port,omitempty" yaml:"mjpeg_port,omitempty"` // WDA remote MJPEG port
LogOn bool `json:"log_on,omitempty" yaml:"log_on,omitempty"` LogOn bool `json:"log_on,omitempty" yaml:"log_on,omitempty"`
LazySetup bool `json:"lazy_setup,omitempty" yaml:"lazy_setup,omitempty"` // lazy setup WDA
// switch to iOS springboard before init WDA session // switch to iOS springboard before init WDA session
ResetHomeOnStartup bool `json:"reset_home_on_startup,omitempty" yaml:"reset_home_on_startup,omitempty"` ResetHomeOnStartup bool `json:"reset_home_on_startup,omitempty" yaml:"reset_home_on_startup,omitempty"`
@@ -28,6 +29,9 @@ func (dev *IOSDeviceOptions) Options() (deviceOptions []IOSDeviceOption) {
if dev.LogOn { if dev.LogOn {
deviceOptions = append(deviceOptions, WithWDALogOn(true)) deviceOptions = append(deviceOptions, WithWDALogOn(true))
} }
if dev.LazySetup {
deviceOptions = append(deviceOptions, WithLazySetup(true))
}
if dev.ResetHomeOnStartup { if dev.ResetHomeOnStartup {
deviceOptions = append(deviceOptions, WithResetHomeOnStartup(true)) deviceOptions = append(deviceOptions, WithResetHomeOnStartup(true))
} }
@@ -115,6 +119,12 @@ func WithWDALogOn(logOn bool) IOSDeviceOption {
} }
} }
func WithLazySetup(lazySetup bool) IOSDeviceOption {
return func(device *IOSDeviceOptions) {
device.LazySetup = lazySetup
}
}
func WithResetHomeOnStartup(reset bool) IOSDeviceOption { func WithResetHomeOnStartup(reset bool) IOSDeviceOption {
return func(device *IOSDeviceOptions) { return func(device *IOSDeviceOptions) {
device.ResetHomeOnStartup = reset device.ResetHomeOnStartup = reset