GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-12 19:39:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-v4.3' of https://github.com/httprunner/httprunner into dev-v4.3

Browse Source
This commit is contained in:
debugtalk
2022-10-10 15:43:06 +08:00
parent c428b1d95e 5a2551fc17
commit 2794c4a97f
3 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hrp/runner.go
View File

@@ -390,12 +390,26 @@ func (r *testCaseRunner) parseConfig() error {
// init iOS/Android clients
for _, iosDeviceConfig := range r.parsedConfig.IOS {
if iosDeviceConfig.UDID != "" {
udid, err := r.parser.ParseString(iosDeviceConfig.UDID, parsedVariables)
if err != nil {
return errors.Wrap(err, "failed to parse ios device udid")
}
iosDeviceConfig.UDID = udid.(string)
}
_, err := r.hrpRunner.initUIClient(iosDeviceConfig)
if err != nil {
return errors.Wrap(err, "init iOS WDA client failed")
}
}
for _, androidDeviceConfig := range r.parsedConfig.Android {
if androidDeviceConfig.SerialNumber != "" {
sn, err := r.parser.ParseString(androidDeviceConfig.SerialNumber, parsedVariables)
if err != nil {
return errors.Wrap(err, "failed to parse android device serial")
}
androidDeviceConfig.SerialNumber = sn.(string)
}
_, err := r.hrpRunner.initUIClient(androidDeviceConfig)
if err != nil {
return errors.Wrap(err, "init Android UIAutomator client failed")

9
hrp/step_android_ui.go
View File

@@ -503,6 +503,15 @@ func runStepAndroid(s *SessionRunner, step *TStep) (stepResult *StepResult, err
}
parser := s.GetParser()
// parse device serial
if step.Android.AndroidDevice.SerialNumber != "" {
sn, err := parser.ParseString(step.Android.AndroidDevice.SerialNumber, stepVariables)
if err != nil {
return stepResult, err
}
step.Android.AndroidDevice.SerialNumber = sn.(string)
}
// init uiaClient driver
uiaClient, err := s.hrpRunner.initUIClient(&step.Android.AndroidDevice)
if err != nil {

9
hrp/step_ios_ui.go
View File

@@ -525,6 +525,15 @@ func runStepIOS(s *SessionRunner, step *TStep) (stepResult *StepResult, err erro
}
parser := s.GetParser()
// parse device udid
if step.IOS.IOSDevice.UDID != "" {
udid, err := parser.ParseString(step.IOS.IOSDevice.UDID, stepVariables)
if err != nil {
return stepResult, err
}
step.IOS.IOSDevice.UDID = udid.(string)
}
// init wdaClient driver
wdaClient, err := s.hrpRunner.initUIClient(&step.IOS.IOSDevice)
if err != nil {