GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-08-22 08:43:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

change: parse mobile device config

Browse Source
This commit is contained in:
lilong.129
2025-05-12 19:16:01 +08:00
parent 9c735bd46a
commit 4d48a418f9
2 changed files with 31 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/version/VERSION
View File

@@ -1 +1 @@
v5.0.0-beta-2505121804 v5.0.0-beta-2505121916

75
runner.go
View File

@@ -422,124 +422,109 @@ func (r *CaseRunner) parseConfig() (parsedConfig *TConfig, err error) {
} }
r.parametersIterator = parametersIterator r.parametersIterator = parametersIterator
// register uixt drivers
if err := r.RegisterUIXTDrivers(parsedConfig); err != nil {
return nil, errors.Wrap(err, "register uixt drivers failed")
}
return parsedConfig, nil
}
func (r *CaseRunner) RegisterUIXTDrivers(config *TConfig) error {
// ai options // ai options
aiOpts := []option.AIServiceOption{} aiOpts := []option.AIServiceOption{}
if config.LLMService != "" { if parsedConfig.LLMService != "" {
aiOpts = append(aiOpts, option.WithLLMService(option.LLMServiceType(config.LLMService))) aiOpts = append(aiOpts, option.WithLLMService(option.LLMServiceType(parsedConfig.LLMService)))
} }
if config.CVService == "" { if parsedConfig.CVService == "" {
// default to vedem // default to vedem
config.CVService = option.CVServiceTypeVEDEM parsedConfig.CVService = option.CVServiceTypeVEDEM
} }
aiOpts = append(aiOpts, option.WithCVService(config.CVService)) aiOpts = append(aiOpts, option.WithCVService(parsedConfig.CVService))
// parse android devices config // parse android devices config
for _, androidDeviceOptions := range config.Android { for _, androidDeviceOptions := range parsedConfig.Android {
err := r.parseDeviceConfig(androidDeviceOptions, config.Variables) err := r.parseDeviceConfig(androidDeviceOptions, parsedConfig.Variables)
if err != nil { if err != nil {
return errors.Wrap(code.InvalidCaseError, return nil, errors.Wrap(code.InvalidCaseError,
fmt.Sprintf("parse android config failed: %v", err)) fmt.Sprintf("parse android config failed: %v", err))
} }
device, err := uixt.NewAndroidDevice(androidDeviceOptions.Options()...) device, err := uixt.NewAndroidDevice(androidDeviceOptions.Options()...)
if err != nil { if err != nil {
return errors.Wrap(err, "init android device failed") return nil, errors.Wrap(err, "init android device failed")
} }
driver, err := device.NewDriver() driver, err := device.NewDriver()
if err != nil { if err != nil {
return errors.Wrap(err, "init android driver failed") return nil, errors.Wrap(err, "init android driver failed")
} }
driverExt, err := uixt.NewXTDriver(driver, aiOpts...) driverExt, err := uixt.NewXTDriver(driver, aiOpts...)
if err != nil { if err != nil {
return errors.Wrap(err, "init android XTDriver failed") return nil, errors.Wrap(err, "init android XTDriver failed")
} }
r.RegisterUIXTDriver(androidDeviceOptions.SerialNumber, driverExt) r.RegisterUIXTDriver(androidDeviceOptions.SerialNumber, driverExt)
} }
// parse iOS devices config // parse iOS devices config
for _, iosDeviceOptions := range config.IOS { for _, iosDeviceOptions := range parsedConfig.IOS {
err := r.parseDeviceConfig(iosDeviceOptions, config.Variables) err := r.parseDeviceConfig(iosDeviceOptions, parsedConfig.Variables)
if err != nil { if err != nil {
return errors.Wrap(code.InvalidCaseError, return nil, errors.Wrap(code.InvalidCaseError,
fmt.Sprintf("parse ios config failed: %v", err)) fmt.Sprintf("parse ios config failed: %v", err))
} }
device, err := uixt.NewIOSDevice(iosDeviceOptions.Options()...) device, err := uixt.NewIOSDevice(iosDeviceOptions.Options()...)
if err != nil { if err != nil {
return errors.Wrap(err, "init ios device failed") return nil, errors.Wrap(err, "init ios device failed")
} }
driver, err := device.NewDriver() driver, err := device.NewDriver()
if err != nil { if err != nil {
return errors.Wrap(err, "init ios driver failed") return nil, errors.Wrap(err, "init ios driver failed")
} }
driverExt, err := uixt.NewXTDriver(driver, aiOpts...) driverExt, err := uixt.NewXTDriver(driver, aiOpts...)
if err != nil { if err != nil {
return errors.Wrap(err, "init ios XTDriver failed") return nil, errors.Wrap(err, "init ios XTDriver failed")
} }
r.RegisterUIXTDriver(iosDeviceOptions.UDID, driverExt) r.RegisterUIXTDriver(iosDeviceOptions.UDID, driverExt)
} }
// parse harmony devices config // parse harmony devices config
for _, harmonyDeviceOptions := range config.Harmony { for _, harmonyDeviceOptions := range parsedConfig.Harmony {
err := r.parseDeviceConfig(harmonyDeviceOptions, config.Variables) err := r.parseDeviceConfig(harmonyDeviceOptions, parsedConfig.Variables)
if err != nil { if err != nil {
return errors.Wrap(code.InvalidCaseError, return nil, errors.Wrap(code.InvalidCaseError,
fmt.Sprintf("parse harmony config failed: %v", err)) fmt.Sprintf("parse harmony config failed: %v", err))
} }
device, err := uixt.NewHarmonyDevice(harmonyDeviceOptions.Options()...) device, err := uixt.NewHarmonyDevice(harmonyDeviceOptions.Options()...)
if err != nil { if err != nil {
return errors.Wrap(err, "init harmony device failed") return nil, errors.Wrap(err, "init harmony device failed")
} }
driver, err := device.NewDriver() driver, err := device.NewDriver()
if err != nil { if err != nil {
return errors.Wrap(err, "init harmony driver failed") return nil, errors.Wrap(err, "init harmony driver failed")
} }
driverExt, err := uixt.NewXTDriver(driver, aiOpts...) driverExt, err := uixt.NewXTDriver(driver, aiOpts...)
if err != nil { if err != nil {
return errors.Wrap(err, "init harmony XTDriver failed") return nil, errors.Wrap(err, "init harmony XTDriver failed")
} }
r.RegisterUIXTDriver(harmonyDeviceOptions.ConnectKey, driverExt) r.RegisterUIXTDriver(harmonyDeviceOptions.ConnectKey, driverExt)
} }
// parse browser devices config // parse browser devices config
for _, browserDeviceOptions := range config.Browser { for _, browserDeviceOptions := range parsedConfig.Browser {
err := r.parseDeviceConfig(browserDeviceOptions, config.Variables) err := r.parseDeviceConfig(browserDeviceOptions, parsedConfig.Variables)
if err != nil { if err != nil {
return errors.Wrap(code.InvalidCaseError, return nil, errors.Wrap(code.InvalidCaseError,
fmt.Sprintf("parse browser config failed: %v", err)) fmt.Sprintf("parse browser config failed: %v", err))
} }
device, err := uixt.NewBrowserDevice(browserDeviceOptions.Options()...) device, err := uixt.NewBrowserDevice(browserDeviceOptions.Options()...)
if err != nil { if err != nil {
return errors.Wrap(err, "init browser device failed") return nil, errors.Wrap(err, "init browser device failed")
}
if err := device.Setup(); err != nil {
return err
} }
driver, err := device.NewDriver() driver, err := device.NewDriver()
if err != nil { if err != nil {
return errors.Wrap(err, "init browser driver failed") return nil, errors.Wrap(err, "init browser driver failed")
}
if err := driver.Setup(); err != nil {
return errors.Wrap(err, "init browser driver failed")
} }
driverExt, err := uixt.NewXTDriver(driver, aiOpts...) driverExt, err := uixt.NewXTDriver(driver, aiOpts...)
if err != nil { if err != nil {
return errors.Wrap(err, "init browser XTDriver failed") return nil, errors.Wrap(err, "init browser XTDriver failed")
} }
r.RegisterUIXTDriver(browserDeviceOptions.BrowserID, driverExt) r.RegisterUIXTDriver(browserDeviceOptions.BrowserID, driverExt)
} }
return nil return parsedConfig, nil
} }
func (r *CaseRunner) RegisterUIXTDriver(serial string, driver *uixt.XTDriver) { func (r *CaseRunner) RegisterUIXTDriver(serial string, driver *uixt.XTDriver) {